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:21 UTC
[jena] branch geosparql created (now 3566fff)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git.
at 3566fff JENA-664: POM files for GeoSPARQL
This branch includes the following new commits:
new 2f75797 Merge master into jena-geosparql
new 6f4719b - applied Apache contributors license. - cleaned up unused imports.
new 6196933 - removed commented out System.out messages in Test packages.
new 8e8bce0 - removed System.out messages for test name from Test packages.
new ef82bd9 - renamed packages to org.apache.jena.fuseki.geosparql.
new da2589f JENA-664: Merge commit 'refs/pull/557/head' of https://github.com/apache/jena into geosparql
new 0df9471 JENA-664: Java line endings
new 3566fff JENA-664: POM files for GeoSPARQL
The 8 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.
[jena] 01/08: Merge master into jena-geosparql
Posted by an...@apache.org.
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 2f75797ab8bb26c29c152bbdd8bd97402f99b649
Merge: 32bfee7 b58c56f
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 16:53:37 2019 +0100
Merge master into jena-geosparql
Conflicts:
pom.xml
apache-jena/assembly-jena-zip.xml | 38 ---
apache-jena/pom.xml | 42 +---
jena-arq/DEPENDENCIES | 26 --
jena-arq/LICENSE | 202 ---------------
jena-arq/NOTICE | 11 -
.../jena/query/ParameterizedSparqlString.java | 178 ++++++++-----
.../java/org/apache/jena/riot/system/RiotLib.java | 41 +--
.../main/java/org/apache/jena/riot/web/HttpOp.java | 19 +-
.../org/apache/jena/sparql/core/GraphView.java | 18 +-
.../sparql/engine/iterator/QueryIterDistinct.java | 2 +-
.../jena/sparql/expr/nodevalue/NodeFunctions.java | 23 +-
jena-arq/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-arq/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-arq/src/main/resources/META-INF/NOTICE | 11 -
.../org/apache/jena/sparql/expr/TestFunctions.java | 2 +-
...Graph2.java => AbstractTestGraphAddDelete.java} | 3 +-
...ng2.java => AbstractTestPrefixMappingView.java} | 3 +-
.../jena/web/AbstractTestDatasetGraphAccessor.java | 2 +-
.../java/org/apache/jena/atlas/iterator/Iter.java | 54 +++-
jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 7 +-
jena-cmds/src/main/java/tdb2/tdbcompact.java | 2 +-
jena-core/DEPENDENCIES | 17 --
jena-core/LICENSE | 236 ------------------
jena-core/NOTICE | 18 --
jena-core/src/main/resources/META-INF/DEPENDENCIES | 17 --
jena-core/src/main/resources/META-INF/LICENSE | 236 ------------------
jena-core/src/main/resources/META-INF/NOTICE | 14 --
jena-db/LICENSE | 202 ---------------
jena-db/NOTICE | 8 -
.../base/recordbuffer/RecordRangeIterator.java | 2 -
jena-db/jena-dboe-storage/pom.xml | 81 ++++++
.../org/apache/jena/dboe/storage/DatabaseRDF.java | 39 +++
.../apache/jena/dboe/storage/StoragePrefixes.java | 82 ++++++
.../org/apache/jena/dboe/storage/StorageRDF.java | 252 +++++++++++++++++++
.../org/apache/jena/dboe/storage/migrate/M.java | 65 +++++
.../jena/dboe/storage/migrate/StreamOps.java | 58 +++++
.../jena/dboe/storage/prefixes/PrefixEntry.java | 42 ++++
.../jena/dboe/storage/prefixes/PrefixLib.java | 99 ++++++++
.../jena/dboe/storage/prefixes/PrefixMapBase.java | 124 ++++++++++
.../jena/dboe/storage/prefixes/PrefixMapI.java | 104 ++++++++
.../storage/prefixes/PrefixMapOverPrefixMapI.java | 105 ++++++++
.../storage/prefixes/PrefixMapStorageSimple.java | 74 ++++++
.../prefixes/PrefixMappingOverPrefixMapI.java | 145 +++++++++++
.../dboe/storage/prefixes/PrefixesFactory.java | 62 +++++
.../dboe/storage/prefixes/StoragePrefixMap.java | 79 ++++++
.../storage/prefixes/StoragePrefixesEmpty.java | 74 ++++++
.../dboe/storage/prefixes/StoragePrefixesView.java | 108 ++++++++
.../apache/jena/dboe/storage/simple/SimpleDB.java | 34 ++-
.../jena/dboe/storage/simple/StorageMem.java | 28 +++
.../dboe/storage/simple/StoragePrefixesMem.java | 120 +++++++++
.../jena/dboe/storage/simple/StorageTuples.java | 116 +++++++++
.../jena/dboe/storage/simple/StorageTuplesN.java | 86 +++++++
.../dboe/storage/system/DatasetGraphStorage.java | 182 ++++++++++++++
.../jena/dboe/storage/system/GraphViewStorage.java | 71 ++++++
.../jena/dboe/storage/system/StorageLib.java | 80 ++++++
.../org/apache/jena/dboe/storage/TC_StoreBase.java | 34 +--
.../AbstractTestDatasetPrefixesStorage.java | 85 +++++++
.../jena/dboe/storage/prefixes/TS_Prefixes.java | 37 +++
.../storage/prefixes/TestDatasetPrefixesMem.java | 38 +++
.../jena/dboe/storage/prefixes/TestPrefixLib.java | 95 +++++++
.../prefixes/TestPrefixMapOverPrefixMapI.java | 26 +-
.../TestPrefixMappingOverDatasetPrefixes.java | 41 +++
.../TestPrefixMappingOverDatasetPrefixes2.java | 44 ++++
.../prefixes/TestPrefixMappingOverPrefixMap.java | 39 +++
.../dboe/storage/storage/BaseTestStorageRDF.java | 131 ++++++++++
.../jena/dboe/storage/storage/TS_Storage.java | 30 +++
.../storage/TestDatasetGraphStorageFindTests.java | 28 +++
.../storage/TestDatasetGraphStorageTests.java | 28 +++
.../dboe/storage/storage/TestStorageSimple.java | 30 +++
.../jena/dboe/trans/bplustree/BPlusTree.java | 32 +--
.../org/apache/jena/dboe/trans/bplustree/Mode.java | 32 +--
.../jena/dboe/trans/data/TransBinaryDataFile.java | 6 +-
.../org/apache/jena/dboe/trans/data/TransBlob.java | 4 +-
.../apache/jena/dboe/transaction/TransInteger.java | 4 +-
.../dboe/transaction/txn}/IteratorTxnTracker.java | 6 +-
.../jena/dboe/transaction/txn/Transaction.java | 11 +
.../txn/TransactionalComponentLifecycle.java | 92 ++-----
.../src/main/java/org/apache/jena/tdb2/TDB2.java | 2 +-
.../org/apache/jena/tdb2/setup/TDBBuilder.java | 2 +-
.../apache/jena/tdb2/store/DatasetGraphTDB.java | 41 +--
.../jena/tdb2/store/GraphViewSwitchable.java | 4 +-
.../tdb2/store/IteratorCheckNotConcurrent.java | 93 -------
.../jena/tdb2/store/nodetable/NodeTableCache.java | 3 -
.../apache/jena/tdb2/sys/DatabaseConnection.java | 3 +-
.../jena/tdb2/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb2/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb2/store/TestGraphTDB.java | 4 +-
jena-db/pom.xml | 1 +
jena-elephas/LICENSE | 176 -------------
jena-elephas/NOTICE | 5 -
jena-elephas/pom.xml | 16 +-
.../apache/jena/fuseki/build/FusekiBuildLib.java | 10 +-
.../org/apache/jena/fuseki/build/FusekiConst.java | 1 +
.../jena/fuseki/ctl/ActionContainerItem.java | 2 +-
.../org/apache/jena/fuseki/ctl/ActionStats.java | 24 +-
.../org/apache/jena/fuseki/server/DataService.java | 12 +
.../jena/fuseki/servlets/SPARQL_QueryDataset.java | 5 +-
.../org/apache/jena/fuseki/main/FusekiServer.java | 58 +++--
.../java/org/apache/jena/fuseki/TestAdmin.java | 24 +-
jena-integration-tests/LICENSE | 177 -------------
jena-integration-tests/NOTICE | 4 -
jena-iri/DEPENDENCIES | 13 -
jena-iri/LICENSE | 175 -------------
jena-iri/NOTICE | 11 -
jena-iri/src/main/resources/META-INF/DEPENDENCIES | 13 -
jena-iri/src/main/resources/META-INF/LICENSE | 175 -------------
jena-iri/src/main/resources/META-INF/NOTICE | 11 -
jena-jdbc/LICENSE | 275 ---------------------
jena-jdbc/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-bundle/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-bundle/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-mem/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-mem/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-remote/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-remote/NOTICE | 10 -
jena-jdbc/jena-jdbc-driver-tdb/LICENSE | 275 ---------------------
jena-jdbc/jena-jdbc-driver-tdb/NOTICE | 10 -
jena-maven-tools/LICENSE | 202 ---------------
jena-maven-tools/pom.xml | 6 +-
jena-permissions/LICENSE | 202 ---------------
jena-permissions/NOTICE | 9 -
jena-rdfconnection/LICENSE | 177 -------------
jena-rdfconnection/NOTICE | 5 -
jena-sdb/LICENSE | 202 ---------------
jena-sdb/NOTICE | 11 -
jena-sdb/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-sdb/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-sdb/src/main/resources/META-INF/NOTICE | 11 -
jena-shaded-guava/DEPENDENCIES | 2 -
jena-shaded-guava/LICENSE | 175 -------------
jena-spatial/DEPENDENCIES | 25 --
jena-spatial/LICENSE | 202 ---------------
jena-spatial/NOTICE | 5 -
jena-spatial/src/main/resources/META-INF/NOTICE | 5 -
jena-tdb/DEPENDENCIES | 16 --
jena-tdb/LICENSE | 175 -------------
jena-tdb/NOTICE | 11 -
.../apache/jena/tdb/store/DatasetPrefixesTDB.java | 7 +-
jena-tdb/src/main/resources/META-INF/DEPENDENCIES | 19 --
jena-tdb/src/main/resources/META-INF/LICENSE | 175 -------------
jena-tdb/src/main/resources/META-INF/NOTICE | 11 -
.../jena/tdb/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb/store/TestGraphTDB.java | 4 +-
jena-text-es/LICENSE | 202 ---------------
jena-text-es/NOTICE | 5 -
jena-text-es/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-text-es/src/main/resources/META-INF/NOTICE | 5 -
jena-text/LICENSE | 202 ---------------
jena-text/NOTICE | 5 -
.../apache/jena/query/text/TextIndexLucene.java | 3 +
jena-text/src/main/resources/META-INF/LICENSE | 202 ---------------
jena-text/src/main/resources/META-INF/NOTICE | 5 -
jena-text/src/test/resources/log4j.properties | 3 +
pom.xml | 196 ++++++++++++++-
155 files changed, 3578 insertions(+), 6674 deletions(-)
diff --cc pom.xml
index 160e21f,cfb23b3..32a71d2
--- a/pom.xml
+++ b/pom.xml
@@@ -767,370 -765,372 +767,564 @@@
unecessarily clutter so we exclude these
-->
<exclude>**/META-INF/services/*</exclude>
-
+
<!--
Jena historically has large numbers of small test file
- with no license headers. Such small files are not required
- to have headers.
-
- In addition, there are files with different Licenses
- (e.g. W3C Software Licence, W3C Test Suite License) as
- noted in the code tree.
- -->
- <exclude>**/src/test/resources/**/*</exclude>
- <exclude>**/testing/**/*</exclude>
-
- <exclude>**/log4j.properties</exclude>
- <exclude>**/log4j-testing.properties</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/DB/**/*</exclude>
- <!-- TDB config files JSON - no comments allowed -->
- <exclude>**/tdb*.cfg</exclude>
- <!-- Fuseki2 server "run" area -->
- <exclude>**/run/**/*</exclude>
- <!-- Cached classpath for commands - autogenerated -->
- <exclude>**/*.classpath</exclude>
- <!-- Cached recommenders by Eclipse - autogenerated -->
- <exclude>**/*.recommenders/**/*</exclude>
-
- <!-- Exclude anything created during the build (plugin generated files) ->-->
- <exclude>**/target/**/*</exclude>
- <!-- MSHADE-124 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>jena-examples/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
+ with no license headers. Such small files are not required
+ to have headers.
+
+ In addition, there are files with different Licenses
+ (e.g. W3C Software Licence, W3C Test Suite License) as
+ noted in the code tree.
+ -->
+ <exclude>**/src/test/resources/**/*</exclude>
+ <exclude>**/testing/**/*</exclude>
+
+ <exclude>**/log4j.properties</exclude>
+ <exclude>**/log4j-testing.properties</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/DB/**/*</exclude>
+ <!-- TDB config files JSON - no comments allowed -->
+ <exclude>**/tdb*.cfg</exclude>
+ <!-- Fuseki2 server "run" area -->
+ <exclude>**/run/**/*</exclude>
+ <!-- Cached classpath for commands - autogenerated -->
+ <exclude>**/*.classpath</exclude>
+ <!-- Cached recommenders by Eclipse - autogenerated -->
+ <exclude>**/*.recommenders/**/*</exclude>
+
+ <!-- Exclude anything created during the build (plugin generated files) ->-->
+ <exclude>**/target/**/*</exclude>
+ <!-- MSHADE-124 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>.travis.yml</exclude>
+ <exclude>jena-examples/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
- <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
- <pluginManagement>
- <plugins>
+ <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
+ <pluginManagement>
+ <plugins>
- <plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>source,lines,vars</debuglevel>
+ <optimize>true</optimize>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <!--
+ Bug: SUREFIRE-1588
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ -->
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Java 11: explicitly define the source as Java8 -->
+ <source>8</source>
+ <!-- Java 10
+ <additionalOptions>-html5</additionalOptions>
+ -->
+ <quiet>true</quiet>
+ <doclint>none</doclint>
+ <!-- To allow the build to keep going despite javadoc problems:
+ <failOnError>false</failOnError>
+ -->
+ <version>true</version>
+ <show>public</show>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licensed under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
+ <link>http://jena.apache.org/documentation/javadoc/text/</link>
+ <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
+ <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
+ <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
+ <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
+ 1.6 should fix this - SNAPSHOT already does.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ <DependencyConvergence />
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>4.2.0</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <!--
+ Avoid the warnings and errors from m2e.
+ This plugin's configuration is used to store Eclipse m2e settings only.
+ It has no influence on the Maven build itself.
+ -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <!--
- Warning:
- "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <!--
- Error:
- Plugin execution not covered by lifecycle configuration
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.11,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.xenei</groupId>
- <artifactId>contract-test-maven-plugin</artifactId>
- <versionRange>[0.1.5,)</versionRange>
- <goals>
- <goal>contract-test</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <instrumentation>
- <ignores>
- <ignore>org.slf4j.*</ignore>
- </ignores>
- </instrumentation>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>source,lines,vars</debuglevel>
+ <optimize>true</optimize>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <!--
+ Bug: SUREFIRE-1588
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ -->
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Java 10
+ <additionalOptions>-html5</additionalOptions>
+ -->
+ <quiet>true</quiet>
+ <doclint>none</doclint>
+ <!-- To allow the build to keep going despite javadoc problems:
+ <failOnError>false</failOnError>
+ -->
+ <version>true</version>
+ <show>public</show>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licensed under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
+ <link>http://jena.apache.org/documentation/javadoc/text/</link>
+ <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
+ <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
+ <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
+ <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
+ 1.6 should fix this - SNAPSHOT already does.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ <DependencyConvergence />
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <!--
+ Avoid the warnings and errors from m2e.
+ This plugin's configuration is used to store Eclipse m2e settings only.
+ It has no influence on the Maven build itself.
+ -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <!--
+ Error:
+ Plugin execution not covered by lifecycle configuration
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <versionRange>[0.11,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <versionRange>[0.1.5,)</versionRange>
+ <goals>
+ <goal>contract-test</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.8</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
+ <plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <instrumentation>
+ <ignores>
+ <ignore>org.slf4j.*</ignore>
+ </ignores>
+ </instrumentation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.8</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
[jena] 08/08: JENA-664: POM files for GeoSPARQL
Posted by an...@apache.org.
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 3566fffd0777897edd7f110519fd54fc2d4b7407
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed May 8 12:46:15 2019 +0100
JENA-664: POM files for GeoSPARQL
---
jena-fuseki-geosparql/pom.xml | 1 -
.../src/main/resources/logback.xml | 47 --
jena-geosparql/pom.xml | 28 +-
pom.xml | 583 +++++++--------------
4 files changed, 213 insertions(+), 446 deletions(-)
diff --git a/jena-fuseki-geosparql/pom.xml b/jena-fuseki-geosparql/pom.xml
index a2fd72e..16c2099 100644
--- a/jena-fuseki-geosparql/pom.xml
+++ b/jena-fuseki-geosparql/pom.xml
@@ -74,7 +74,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.1</version>
</dependency>
<dependency>
diff --git a/jena-fuseki-geosparql/src/main/resources/logback.xml b/jena-fuseki-geosparql/src/main/resources/logback.xml
deleted file mode 100644
index a9d4be4..0000000
--- a/jena-fuseki-geosparql/src/main/resources/logback.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<configuration debug="false">
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
- <logger name="org.apache.jena" level="WARN" />
- <logger name="org.eclipse.jetty" level="WARN" />
- <logger name="org.apache.http" level="WARN" />
- <logger name="TDB" level="WARN" />
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>INFO</level>
- </filter>
- <encoder>
- <!--<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
- <pattern>%d{HH:mm:ss.SSS} %-5level %msg%n</pattern>
- </encoder>
- </appender>
-
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
- <property name="LOG_FOLDER" value="./logs" />
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_FOLDER}/jena-fuseki-geosparql-${bySecond}.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${LOG_FOLDER}/jena-fuseki-geosparql-${bySecond}-%i.log</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
- <!-- set immediateFlush to false for much higher logging throughput -->
- <immediateFlush>false</immediateFlush>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg%n</pattern>
- <!--<pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern>-->
- </encoder>
- </appender>
-
- <root level="info">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/jena-geosparql/pom.xml b/jena-geosparql/pom.xml
index f6beb86..78fd230 100644
--- a/jena-geosparql/pom.xml
+++ b/jena-geosparql/pom.xml
@@ -38,6 +38,20 @@
<dependencies>
+ <!-- Non-free; testing only -->
+ <dependency>
+ <groupId>org.apache.sis.non-free</groupId>
+ <artifactId>sis-embedded-data</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
@@ -87,18 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <!--
- The test collections TC_General, TC_Riot, TC_Atlas
- are development support that collect the relevant
- tests for partial testing during development.
- -->
- <include>**/TS_*.java</include>
- <include>**/TC_Scripted.java</include>
- <include>**/TC_DAWG.java</include>
- </includes>
- </configuration>
</plugin>
<plugin>
@@ -158,4 +160,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 32a71d2..57a8a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
<properties>
<ver.slf4j>1.7.26</ver.slf4j>
<ver.log4j>1.2.17</ver.log4j>
- <ver.junit>4.12</ver.junit>
+ <ver.junit>4.12</ver.junit>
<ver.jetty>9.4.12.v20180830</ver.jetty>
<ver.libthrift>0.12.0</ver.libthrift>
@@ -153,7 +153,7 @@
<profiles>
<profile>
<!--
- This is the dev profile, typically used locally with
+ This is the dev profile, typically used locally with
"mvn clean install -Pdev".
It builds the modules shipped in apache-jena binaries
but does not build these binaries.
@@ -164,24 +164,26 @@
<module>jena-shaded-guava</module>
<module>jena-iri</module>
<module>jena-base</module>
-
+
<module>jena-core</module>
<module>jena-arq</module>
<module>jena-rdfconnection</module>
<module>jena-tdb</module>
- <module>jena-db</module>
+ <module>jena-db</module>
<module>apache-jena-libs</module>
<module>jena-text</module>
<!-- <module>jena-text-es</module> -->
<module>jena-spatial</module>
- <module>jena-geosparql</module>
- <module>jena-fuseki-geosparql</module>
+
<module>jena-cmds</module>
<module>jena-fuseki2</module>
<module>jena-integration-tests</module>
+ <module>jena-geosparql</module>
+ <module>jena-fuseki-geosparql</module>
+
<!-- Binary distribution -->
<!-- <module>apache-jena</module> -->
@@ -232,19 +234,18 @@
<module>jena-text</module>
<module>jena-text-es</module>
<module>jena-spatial</module>
- <module>jena-geosparql</module>
<module>jena-cmds</module>
<module>jena-fuseki2</module>
<!--
- Tests of artifacts that require additional
+ Tests of artifacts that require additional
modules built later in the build process.
For example, use Fuseki as a test server to
test remote client APIs.
-->
<module>jena-integration-tests</module>
-
+
<!-- Binary distribution -->
<module>apache-jena</module>
@@ -262,7 +263,7 @@
<!-- Slow building modules -->
<module>jena-jdbc</module>
- <!-- Fails when building with Java9 JDK because it requires
+ <!-- Fails when building with Java9 JDK because it requires
system jar jdk.tools which is not available in Java9 onwards
-->
<module>jena-elephas</module>
@@ -311,13 +312,13 @@
<artifactId>commons-codec</artifactId>
<version>${ver.commons-codec}</version>
</dependency>
-
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${ver.commonsio}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -375,14 +376,14 @@
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
-
+
<!-- supports persistent data structures -->
<dependency>
<groupId>com.github.andrewoma.dexx</groupId>
<artifactId>collection</artifactId>
<version>${ver.dexxcollection}</version>
</dependency>
-
+
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
@@ -425,20 +426,20 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${ver.jetty}</version>
</dependency>
-
+
<!-- Jetty's useful servlets, inc compression -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${ver.jetty}</version>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
@@ -529,7 +530,7 @@
<artifactId>log4j-api</artifactId>
<version>${ver.log4j2}</version>
</dependency>
-
+
<!-- Intercept direct use of log4j2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -562,8 +563,8 @@
<version>${ver.log4j}</version>
</dependency>
- <!-- And intercept any uses of Jakarta Commons Logging
- e.g. Apache Common HTTP client.
+ <!-- And intercept any uses of Jakarta Commons Logging
+ e.g. Apache Common HTTP client.
-->
<dependency>
@@ -590,7 +591,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.xenei</groupId>
<artifactId>contract-test-maven-plugin</artifactId>
@@ -604,7 +605,7 @@
<version>${ver.mockito}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
@@ -720,23 +721,23 @@
jena-core exclusions
-->
<exclude>**/src-examples/data/*</exclude>
-
+
<!--
jena-fuseki exclusions
-->
<exclude>**/dist/ABOUT</exclude>
<exclude>**/SEE_FUSEKI2</exclude>
- <!--
- Need to exclude JS and CSS since much of it comes from other Apache licensed projects
+ <!--
+ Need to exclude JS and CSS since much of it comes from other Apache licensed projects
e.g. Bootstrap, Qonsole
-
+
-->
<exclude>**/src/main/webapp/css/*</exclude>
<exclude>**/src/main/webapp/fonts/*</exclude>
<exclude>**/src/main/webapp/js/**/*</exclude>
-
+
<!-- General exclusions -->
- <!--
+ <!--
Vocabularies are often just local copies of vocabularies
published by others
-->
@@ -751,9 +752,9 @@
-->
<exclude>**/src/main/**/*.html</exclude>
<exclude>**/src/**/package-info.java</exclude>
-
+
<exclude>**/DEPENDENCIES</exclude>
-
+
<!--
Text and Markdown files are typically used only for documentation purposes
and license declarations are usually spurious in these files since often they
@@ -761,57 +762,61 @@
-->
<exclude>**/*.txt</exclude>
<exclude>**/*.md</exclude>
-
+
<!--
META-INF services files can include comments but a license header would be
unecessarily clutter so we exclude these
-->
<exclude>**/META-INF/services/*</exclude>
-
+
<!--
Jena historically has large numbers of small test file
- with no license headers. Such small files are not required
- to have headers.
-
- In addition, there are files with different Licenses
- (e.g. W3C Software Licence, W3C Test Suite License) as
- noted in the code tree.
- -->
- <exclude>**/src/test/resources/**/*</exclude>
- <exclude>**/testing/**/*</exclude>
-
- <exclude>**/log4j.properties</exclude>
- <exclude>**/log4j-testing.properties</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/DB/**/*</exclude>
- <!-- TDB config files JSON - no comments allowed -->
- <exclude>**/tdb*.cfg</exclude>
- <!-- Fuseki2 server "run" area -->
- <exclude>**/run/**/*</exclude>
- <!-- Cached classpath for commands - autogenerated -->
- <exclude>**/*.classpath</exclude>
- <!-- Cached recommenders by Eclipse - autogenerated -->
- <exclude>**/*.recommenders/**/*</exclude>
-
- <!-- Exclude anything created during the build (plugin generated files) ->-->
- <exclude>**/target/**/*</exclude>
- <!-- MSHADE-124 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>jena-examples/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
+ with no license headers. Such small files are not required
+ to have headers.
+
+ In addition, there are files with different Licenses
+ (e.g. W3C Software Licence, W3C Test Suite License) as
+ noted in the code tree.
+ -->
+ <exclude>**/src/test/resources/**/*</exclude>
+ <exclude>**/testing/**/*</exclude>
+
+ <exclude>**/log4j.properties</exclude>
+ <exclude>**/log4j-testing.properties</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/DB/**/*</exclude>
+ <!-- TDB config files JSON - no comments allowed -->
+ <exclude>**/tdb*.cfg</exclude>
+ <!-- Fuseki2 server "run" area -->
+ <exclude>**/run/**/*</exclude>
+ <!-- Cached classpath for commands - autogenerated -->
+ <exclude>**/*.classpath</exclude>
+ <!-- Cached recommenders by Eclipse - autogenerated -->
+ <exclude>**/*.recommenders/**/*</exclude>
+
+ <!-- Exclude anything created during the build (plugin generated files) ->-->
+ <exclude>**/target/**/*</exclude>
+ <!-- MSHADE-124 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>.travis.yml</exclude>
+ <exclude>jena-examples/**</exclude>
+
+ <!-- This is OGC software licensed -->
+ <exclude>**/geosparql_vocab_all_v1_0_1_updated.rdf</exclude>
+
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
- <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
- <pluginManagement>
- <plugins>
+ <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
+ <pluginManagement>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1009,322 +1014,130 @@
-->
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <showDeprecation>false</showDeprecation>
- <encoding>UTF-8</encoding>
- <debug>true</debug>
- <debuglevel>source,lines,vars</debuglevel>
- <optimize>true</optimize>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
- <!--
- Bug: SUREFIRE-1588
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
- -->
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
- <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Java 10
- <additionalOptions>-html5</additionalOptions>
- -->
- <quiet>true</quiet>
- <doclint>none</doclint>
- <!-- To allow the build to keep going despite javadoc problems:
- <failOnError>false</failOnError>
- -->
- <version>true</version>
- <show>public</show>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licensed under the Apache License, Version 2.0</bottom>
- <links>
- <link>http://jena.apache.org/documentation/javadoc/jena/</link>
- <link>http://jena.apache.org/documentation/javadoc/arq/</link>
- <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
- <link>http://jena.apache.org/documentation/javadoc/text/</link>
- <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
- <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
- <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
- <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
- 1.6 should fix this - SNAPSHOT already does.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <rules>
- <requirePluginVersions>
- <message>Best practice is to always define plugin versions!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- </requirePluginVersions>
- <requireReleaseDeps>
- <message>No SNAPSHOT dependencies are allowed!</message>
- <onlyWhenRelease>true</onlyWhenRelease>
- </requireReleaseDeps>
- <DependencyConvergence />
- </rules>
- <fail>true</fail>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <!--
+ Error:
+ Plugin execution not covered by lifecycle configuration
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <versionRange>[0.11,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
-
- <!--
- Avoid the warnings and errors from m2e.
- This plugin's configuration is used to store Eclipse m2e settings only.
- It has no influence on the Maven build itself.
- -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <!--
- Warning:
- "maven-remote-resources-plugin (goal "process") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <!--
- Warning:
- "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <!--
- Error:
- Plugin execution not covered by lifecycle configuration
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.11,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.xenei</groupId>
- <artifactId>contract-test-maven-plugin</artifactId>
- <versionRange>[0.1.5,)</versionRange>
- <goals>
- <goal>contract-test</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
-
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <versionRange>[0.1.5,)</versionRange>
+ <goals>
+ <goal>contract-test</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
- <plugins>
+ </plugins>
+ </pluginManagement>
+ </build>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <instrumentation>
- <ignores>
- <ignore>org.slf4j.*</ignore>
- </ignores>
- </instrumentation>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.8</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.1</version>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <instrumentation>
+ <ignores>
+ <ignore>org.slf4j.*</ignore>
+ </ignores>
+ </instrumentation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.8</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
[jena] 05/08: - renamed packages to
org.apache.jena.fuseki.geosparql.
Posted by an...@apache.org.
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 ef82bd9ce1deda58dc1c57b79115c753b85209d6
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:49:15 2019 +0100
- renamed packages to org.apache.jena.fuseki.geosparql.
---
.../geosparql}/DatasetException.java | 2 +-
.../geosparql}/DatasetOperations.java | 8 ++++----
.../geosparql}/GeosparqlServer.java | 2 +-
.../jena/{jena_fuseki_geosparql => fuseki/geosparql}/Main.java | 4 ++--
.../geosparql}/cli/ArgsConfig.java | 4 ++--
.../geosparql}/cli/FileGraphDelimiter.java | 2 +-
.../geosparql}/cli/FileGraphFormat.java | 2 +-
.../geosparql}/cli/IntegerListConverter.java | 2 +-
.../geosparql}/cli/LongListConverter.java | 2 +-
.../geosparql}/cli/RDFFileParameter.java | 2 +-
.../geosparql}/cli/TabFileParameter.java | 2 +-
.../{jena_fuseki_geosparql => fuseki/geosparql}/MainTest.java | 4 ++--
.../geosparql}/cli/RDFFileParameterTest.java | 2 +-
.../geosparql}/cli/TabFileParameterTest.java | 2 +-
14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetException.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
similarity index 95%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetException.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
index b219855..cdacb2d 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetException.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql;
+package org.apache.jena.fuseki.geosparql;
/**
*
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetOperations.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
similarity index 97%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetOperations.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
index 809c41b..1fbbdc9 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/DatasetOperations.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql;
+package org.apache.jena.fuseki.geosparql;
import io.github.galbiston.rdf_tables.cli.DelimiterValidator;
import io.github.galbiston.rdf_tables.datatypes.DatatypeController;
@@ -29,9 +29,9 @@ import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.jena_fuseki_geosparql.cli.ArgsConfig;
-import org.apache.jena.jena_fuseki_geosparql.cli.FileGraphDelimiter;
-import org.apache.jena.jena_fuseki_geosparql.cli.FileGraphFormat;
+import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
+import org.apache.jena.fuseki.geosparql.cli.FileGraphDelimiter;
+import org.apache.jena.fuseki.geosparql.cli.FileGraphFormat;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.ReadWrite;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/GeosparqlServer.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
similarity index 98%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/GeosparqlServer.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
index 753a139..8be9627 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/GeosparqlServer.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql;
+package org.apache.jena.fuseki.geosparql;
import java.lang.invoke.MethodHandles;
import org.apache.jena.fuseki.main.FusekiServer;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/Main.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
similarity index 93%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/Main.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
index 9fb6476..5ba4ea4 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/Main.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql;
+package org.apache.jena.fuseki.geosparql;
import com.beust.jcommander.JCommander;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import org.apache.jena.geosparql.configuration.SrsException;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.jena_fuseki_geosparql.cli.ArgsConfig;
+import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
import org.apache.jena.query.Dataset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/ArgsConfig.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
similarity index 98%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/ArgsConfig.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
index 2ca9316..3bdac56 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/ArgsConfig.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.converters.FileConverter;
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.apache.jena.jena_fuseki_geosparql.DatasetOperations.SPATIAL_INDEX_FILE;
+import static org.apache.jena.fuseki.geosparql.DatasetOperations.SPATIAL_INDEX_FILE;
/**
*
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphDelimiter.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
similarity index 97%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphDelimiter.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
index 45276d2..c855784 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphDelimiter.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import java.io.File;
import java.util.Objects;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphFormat.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
similarity index 97%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphFormat.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
index 7f85bdf..88aef15 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/FileGraphFormat.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import java.io.File;
import java.util.Objects;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/IntegerListConverter.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
similarity index 96%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/IntegerListConverter.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
index 3d5472c..0594110 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/IntegerListConverter.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.IStringConverter;
import java.util.ArrayList;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/LongListConverter.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
similarity index 96%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/LongListConverter.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
index 1ef4405..0c072c1 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/LongListConverter.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.IStringConverter;
import java.util.ArrayList;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameter.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
similarity index 98%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameter.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
index af103d3..19e80a8 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameter.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.IParameterValidator;
import com.beust.jcommander.IStringConverter;
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameter.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
similarity index 98%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameter.java
rename to jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
index 4a6b452..6591e1f 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameter.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.IParameterValidator;
import com.beust.jcommander.IStringConverter;
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/MainTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
similarity index 94%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/MainTest.java
rename to jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
index fbd23ea..49a4fc4 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/MainTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql;
+package org.apache.jena.fuseki.geosparql;
import com.beust.jcommander.JCommander;
import java.util.ArrayList;
import java.util.List;
+import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.jena_fuseki_geosparql.cli.ArgsConfig;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameterTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
similarity index 95%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameterTest.java
rename to jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
index 425a306..c0044a3 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/RDFFileParameterTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.ParameterException;
import java.io.File;
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameterTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
similarity index 95%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameterTest.java
rename to jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
index 055a539..d3312ea 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/jena_fuseki_geosparql/cli/TabFileParameterTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jena.jena_fuseki_geosparql.cli;
+package org.apache.jena.fuseki.geosparql.cli;
import com.beust.jcommander.ParameterException;
import java.io.File;
[jena] 04/08: - removed System.out messages for test name from Test
packages.
Posted by an...@apache.org.
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 8e8bce07e51f821e5c20d04cdb9533845aebb55f
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:44:42 2019 +0100
- removed System.out messages for test name from Test packages.
---
.../configuration/GeoSPARQLOperationsTest.java | 28 +--
.../jena/geosparql/configuration/ModeSRSTest.java | 3 +-
.../GenericGeometryPropertyFunctionTest.java | 8 +-
.../topological/GenericPropertyFunctionTest.java | 60 +++---
.../SpatialObjectGeometryLiteralTest.java | 12 +-
.../egenhofer/EhContainsPFTest.java | 12 +-
.../egenhofer/EhCoveredByPFTest.java | 12 +-
.../egenhofer/EhCoversPFTest.java | 8 +-
.../egenhofer/EhDisjointPFTest.java | 12 +-
.../egenhofer/EhEqualsPFTest.java | 20 +-
.../egenhofer/EhInsidePFTest.java | 16 +-
.../property_functions/egenhofer/EhMeetPFTest.java | 12 +-
.../egenhofer/EhOverlapPFTest.java | 10 +-
.../CoordinateDimensionPFTest.java | 8 +-
.../geometry_property/DimensionPFTest.java | 6 +-
.../geometry_property/IsEmptyPFTest.java | 4 +-
.../geometry_property/IsSimplePFTest.java | 4 +-
.../geometry_property/IsValidPFTest.java | 4 +-
.../geometry_property/SpatialDimensionPFTest.java | 8 +-
.../rcc8/RccDisconnectedPFTest.java | 4 +-
.../property_functions/rcc8/RccEqualsPFTest.java | 8 +-
.../rcc8/RccExternallyConnectedPFTest.java | 4 +-
.../RccNonTangentialProperPartInversePFTest.java | 4 +-
.../rcc8/RccNonTangentialProperPartPFTest.java | 4 +-
.../rcc8/RccPartiallyOverlappingPFTest.java | 4 +-
.../rcc8/RccTangentialProperPartInversePFTest.java | 4 +-
.../rcc8/RccTangentialProperPartPFTest.java | 4 +-
.../simple_features/SfContainsPFTest.java | 12 +-
.../simple_features/SfCrossesPFTest.java | 16 +-
.../simple_features/SfDisjointPFTest.java | 12 +-
.../simple_features/SfEqualsPFTest.java | 20 +-
.../simple_features/SfIntersectsPFTest.java | 12 +-
.../simple_features/SfOverlapsPFTest.java | 12 +-
.../simple_features/SfTouchesPFTest.java | 12 +-
.../simple_features/SfWithinPFTest.java | 12 +-
.../filter_functions/BoundaryFFTest.java | 4 +-
.../filter_functions/BufferFFTest.java | 14 +-
.../filter_functions/ConvexHullFFTest.java | 4 +-
.../filter_functions/DifferenceFFTest.java | 2 +-
.../filter_functions/DistanceFFTest.java | 4 +-
.../filter_functions/EnvelopFFTest.java | 6 +-
.../filter_functions/GetSRIDFFTest.java | 4 +-
.../filter_functions/IntersectionFFTest.java | 6 +-
.../SymmetricDifferenceFFTest.java | 2 +-
.../filter_functions/UnionFFTest.java | 2 +-
.../egenhofer/EhContainsFFTest.java | 34 ++--
.../egenhofer/EhCoveredByFFTest.java | 34 ++--
.../filter_functions/egenhofer/EhCoversFFTest.java | 30 +--
.../egenhofer/EhDisjointFFTest.java | 34 ++--
.../filter_functions/egenhofer/EhEqualsFFTest.java | 38 ++--
.../filter_functions/egenhofer/EhInsideFFTest.java | 38 ++--
.../filter_functions/egenhofer/EhMeetFFTest.java | 34 ++--
.../egenhofer/EhOverlapFFTest.java | 32 ++--
.../CoordinateDimensionFFTest.java | 8 +-
.../geometry_property/DimensionFFTest.java | 6 +-
.../geometry_property/IsEmptyFFTest.java | 4 +-
.../geometry_property/IsSimpleFFTest.java | 4 +-
.../geometry_property/IsValidFFTest.java | 4 +-
.../geometry_property/SpatialDimensionFFTest.java | 8 +-
.../rcc8/RccDisconnectedFFTest.java | 26 +--
.../filter_functions/rcc8/RccEqualsFFTest.java | 26 +--
.../rcc8/RccExternallyConnectedFFTest.java | 26 +--
.../rcc8/RccNonTangentialProperPartFFTest.java | 26 +--
.../RccNonTangentialProperPartInverseFFTest.java | 26 +--
.../rcc8/RccPartiallyOverlappingFFTest.java | 26 +--
.../rcc8/RccTangentialProperPartFFTest.java | 26 +--
.../rcc8/RccTangentialProperPartInverseFFTest.java | 26 +--
.../simple_features/SfContainsFFTest.java | 34 ++--
.../simple_features/SfCrossesFFTest.java | 38 ++--
.../simple_features/SfDisjointFFTest.java | 34 ++--
.../simple_features/SfEqualsFFTest.java | 38 ++--
.../simple_features/SfIntersectsFFTest.java | 34 ++--
.../simple_features/SfOverlapsFFTest.java | 34 ++--
.../simple_features/SfTouchesFFTest.java | 34 ++--
.../simple_features/SfWithinFFTest.java | 34 ++--
.../implementation/DimensionInfoTest.java | 6 +-
.../implementation/GeometryReverseTest.java | 54 +++---
.../implementation/GeometryWrapperFactoryTest.java | 12 +-
.../implementation/GeometryWrapperTest.java | 48 ++---
.../jena/geosparql/implementation/SRSInfoTest.java | 12 +-
.../implementation/UnitsOfMeasureTest.java | 32 ++--
.../implementation/datatype/GMLDatatypeTest.java | 60 +++---
.../datatype/GeometryDatatypeTest.java | 14 +-
.../implementation/datatype/WKTDatatypeTest.java | 106 +++++------
.../implementation/great_circle/AngleTest.java | 8 +-
.../implementation/great_circle/AzimuthTest.java | 12 +-
.../great_circle/CoordinatePairTest.java | 22 +--
.../great_circle/GreatCircleDistanceTest.java | 4 +-
.../great_circle/GreatCirclePointDistanceTest.java | 20 +-
.../jts/CoordinateSequenceDimensionsTest.java | 10 +-
.../implementation/jts/GeometryTransformTest.java | 12 +-
.../implementation/parsers/gml/GMLReaderTest.java | 204 ++++++++++-----------
.../implementation/parsers/gml/GMLWriterTest.java | 96 +++++-----
.../implementation/parsers/wkt/WKTReaderTest.java | 168 ++++++++---------
.../implementation/parsers/wkt/WKTWriterTest.java | 114 ++++++------
.../implementation/registry/SRSRegistryTest.java | 12 +-
.../geosparql/spatial/ConvertLatLonBoxTest.java | 8 +-
.../jena/geosparql/spatial/ConvertLatLonTest.java | 24 +--
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 46 ++---
.../geosparql/spatial/SpatialIndexTestData.java | 2 +-
.../filter_functions/AngleDegreesFFTest.java | 8 +-
.../spatial/filter_functions/AngleFFTest.java | 8 +-
.../filter_functions/AzimuthDegreesFFTest.java | 8 +-
.../spatial/filter_functions/AzimuthFFTest.java | 8 +-
.../filter_functions/ConvertLatLonBoxFFTest.java | 16 +-
.../filter_functions/ConvertLatLonFFTest.java | 12 +-
.../spatial/filter_functions/DistanceFFTest.java | 20 +-
.../spatial/filter_functions/EqualsFFTest.java | 38 ++--
.../filter_functions/GreatCircleFFTest.java | 22 +--
.../filter_functions/GreatCircleGeomFFTest.java | 18 +-
.../spatial/filter_functions/NearbyFFTest.java | 38 ++--
.../filter_functions/TransformDatatypeFFTest.java | 12 +-
.../spatial/filter_functions/TransformFFTest.java | 18 +-
.../filter_functions/TransformSRSFFTest.java | 12 +-
.../spatial/property_functions/EqualsPFTest.java | 20 +-
.../GenericSpatialGeomPropertyFunctionTest.java | 12 +-
.../GenericSpatialPropertyFunctionTest.java | 10 +-
.../box/GenericSpatialBoxPropertyFunctionTest.java | 18 +-
.../box/IntersectBoxGeomPFTest.java | 6 +-
.../property_functions/box/IntersectBoxPFTest.java | 6 +-
.../box/WithinBoxGeomPFTest.java | 6 +-
.../property_functions/box/WithinBoxPFTest.java | 6 +-
.../cardinal/EastGeomPFTest.java | 8 +-
.../property_functions/cardinal/EastPFTest.java | 8 +-
.../GenericCardinalGeomPropertyFunctionTest.java | 4 +-
.../GenericCardinalPropertyFunctionTest.java | 14 +-
.../cardinal/NorthGeomPFTest.java | 4 +-
.../property_functions/cardinal/NorthPFTest.java | 4 +-
.../cardinal/SouthGeomPFTest.java | 4 +-
.../property_functions/cardinal/SouthPFTest.java | 4 +-
.../cardinal/WestGeomPFTest.java | 8 +-
.../property_functions/cardinal/WestPFTest.java | 8 +-
.../nearby/NearbyGeomPFTest.java | 26 +--
.../property_functions/nearby/NearbyPFTest.java | 24 +--
134 files changed, 1389 insertions(+), 1390 deletions(-)
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
index 68eeee7..3d1fb73 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
@@ -119,7 +119,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Model() {
- System.out.println("convert");
+
Model inputModel = CONVERTED_DATATYPE_DATA;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
Model instance = GeoSPARQLOperations.convert(inputModel);
@@ -132,7 +132,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Model_String() {
- System.out.println("convert");
+
Model inputModel = ORIGINAL_DATA;
String outputSrsURI = SRS_URI.WGS84_CRS;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
@@ -146,7 +146,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Model_GeometryDatatype() {
- System.out.println("convert");
+
Model inputModel = CONVERTED_SRS_DATA;
GeometryDatatype outputDatatype = GMLDatatype.INSTANCE;
TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATA);
@@ -160,7 +160,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_3args_1() {
- System.out.println("convert");
+
Model inputModel = ORIGINAL_DATA;
String outputSrsURI = SRS_URI.WGS84_CRS;
GeometryDatatype outputDatatype = GMLDatatype.INSTANCE;
@@ -175,7 +175,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Dataset() {
- System.out.println("convert");
+
Dataset dataset = CONVERTED_DATATYPE_DATASET;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
Dataset instance = GeoSPARQLOperations.convert(dataset);
@@ -188,7 +188,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Dataset_String() {
- System.out.println("convert");
+
Dataset dataset = ORIGINAL_DATASET;
String outputSrsURI = SRS_URI.WGS84_CRS;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
@@ -202,7 +202,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_Dataset_GeometryDatatype() {
- System.out.println("convert");
+
Dataset dataset = CONVERTED_SRS_DATASET;
GeometryDatatype outputDatatype = GMLDatatype.INSTANCE;
TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATASET);
@@ -216,7 +216,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvert_3args_2() {
- System.out.println("convert");
+
Dataset inputDataset = ORIGINAL_DATASET;
String outputSrsURI = SRS_URI.WGS84_CRS;
GeometryDatatype outputDatatype = GMLDatatype.INSTANCE;
@@ -231,7 +231,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeometryLiterals() {
- System.out.println("convertGeometryLiterals");
+
List<String> geometryLiterals = Arrays.asList("POINT(0 1)", "POINT(2 3)");
String outputSrsURI = SRS_URI.WGS84_CRS;
GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
@@ -245,7 +245,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeometryLiteral() {
- System.out.println("convertGeometryLiteral");
+
String geometryLiteral = "POINT(0 1)";
String outputSrsURI = SRS_URI.WGS84_CRS;
GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
@@ -259,7 +259,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeoPredicates_Dataset_remove() {
- System.out.println("convertGeoPredicates_remove");
+
Dataset dataset = GEO_DATASET;
boolean isRemoveGeoPredicate = true;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
@@ -273,7 +273,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeoPredicates_Model_remove() {
- System.out.println("convertGeoPredicates_remove");
+
Model model = GEO_DATA;
boolean isRemoveGeoPredicates = true;
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
@@ -287,7 +287,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeoPredicates_Dataset_keep() {
- System.out.println("convertGeoPredicates_Dataset_keep");
+
Dataset dataset = GEO_DATASET;
boolean isRemoveGeoPredicate = false;
TreeSet<String> expResult = extract(GEO_ALL_DATASET);
@@ -301,7 +301,7 @@ public class GeoSPARQLOperationsTest {
*/
@Test
public void testConvertGeoPredicates_Model_keep() {
- System.out.println("convertGeoPredicates_Model_keep");
+
Model model = GEO_DATA;
boolean isRemoveGeoPredicates = false;
TreeSet<String> expResult = extract(GEO_ALL_DATA);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
index a986cfe..99795dc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
@@ -74,7 +74,6 @@ public class ModeSRSTest {
*/
@Test
public void testSearch() {
- System.out.println("search");
ModeSRS instance = new ModeSRS();
instance.search(MODEL);
@@ -93,7 +92,7 @@ public class ModeSRSTest {
*/
@Test
public void testGetModeURI() {
- System.out.println("getModeURI");
+
ModeSRS instance = new ModeSRS();
instance.search(MODEL);
String expResult = "http://www.opengis.net/def/crs/OGC/1.3/CRS84";
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
index 47a9ac2..a7c1038 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
@@ -75,7 +75,7 @@ public class GenericGeometryPropertyFunctionTest {
*/
@Test
public void testGetGeometryLiteral() {
- System.out.println("getGeometryLiteral");
+
Graph graph = MODEL.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.COORDINATE_DIMENSION_NODE;
@@ -92,7 +92,7 @@ public class GenericGeometryPropertyFunctionTest {
*/
@Test
public void testGetGeometryLiteral_false() {
- System.out.println("getGeometryLiteral_false");
+
Graph graph = MODEL.getGraph();
Node subject = GEOMETRY_B.asNode();
Node predicate = Geo.COORDINATE_DIMENSION_NODE;
@@ -109,7 +109,7 @@ public class GenericGeometryPropertyFunctionTest {
*/
@Test
public void testGetGeometryLiteral_asserted() {
- System.out.println("getGeometryLiteral_asserted");
+
Graph graph = MODEL.getGraph();
Node subject = GEOMETRY_C.asNode();
Node predicate = Geo.COORDINATE_DIMENSION_NODE;
@@ -126,7 +126,7 @@ public class GenericGeometryPropertyFunctionTest {
*/
@Test
public void testGetGeometryLiteral_blank() {
- System.out.println("getGeometryLiteral_blank");
+
Graph graph = MODEL.getGraph();
Node subject = GEOMETRY_D_BLANK.asNode();
Node predicate = Geo.COORDINATE_DIMENSION_NODE;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
index e312047..517dd61 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
@@ -94,7 +94,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry() {
- System.out.println("queryRewrite_geometry_geometry");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -111,7 +111,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry_blank() {
- System.out.println("queryRewrite_geometry_geometry_blank");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -128,7 +128,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_blank() {
- System.out.println("queryRewrite_blank");
+
Graph graph = model.getGraph();
@@ -145,7 +145,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry_disabled() {
- System.out.println("queryRewrite_geometry_geometry_disabled");
+
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.FALSE);
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
@@ -165,7 +165,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_geometry() {
- System.out.println("queryRewrite_feature_geometry");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -182,7 +182,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_feature() {
- System.out.println("queryRewrite_feature_feature");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -199,7 +199,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_feature() {
- System.out.println("queryRewrite_geometry_feature");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -216,7 +216,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_feature_disabled() {
- System.out.println("queryRewrite_geometry_feature_disabled");
+
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.FALSE);
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
@@ -236,7 +236,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry_false() {
- System.out.println("queryRewrite_geometry_geometry_false");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -253,7 +253,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_geometry_false() {
- System.out.println("queryRewrite_feature_geometry_false");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -270,7 +270,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_feature_false() {
- System.out.println("queryRewrite_feature_feature_false");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -287,7 +287,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_feature_false() {
- System.out.println("queryRewrite_geometry_feature_false");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
Node predicate = Geo.SF_CONTAINS_NODE;
@@ -304,7 +304,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry_asserted() {
- System.out.println("queryRewrite_geometry__geometry_asserted");
+
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
@@ -322,7 +322,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_geometry_geometry_asserted_disabled() {
- System.out.println("queryRewrite_geometry__geometry_asserted_disabled");
+
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.FALSE);
Graph graph = model.getGraph();
Node subject = GEOMETRY_A.asNode();
@@ -342,7 +342,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_feature_disjoint() {
- System.out.println("queryRewrite_feature_feature_disjoint");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_DISJOINT_NODE;
@@ -359,7 +359,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testQueryRewrite_feature_feature_disjoint_false() {
- System.out.println("queryRewrite_feature_feature_disjoint_false");
+
Graph graph = model.getGraph();
Node subject = FEATURE_A.asNode();
Node predicate = Geo.SF_DISJOINT_NODE;
@@ -376,7 +376,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_unbound() {
- System.out.println("execEvaluated_unbound");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
@@ -402,8 +402,8 @@ public class GenericPropertyFunctionTest {
//Blank nodes limit a value check.
boolean expResult = true;
boolean result = subjects.size() == 25 && objects.size() == 25;
- //System.out.println("Subjects: " + subjects);
- //System.out.println("Objects: " + objects);
+ //
+ //
assertEquals(expResult, result);
}
@@ -412,7 +412,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_subject_bound() {
- System.out.println("execEvaluated_subject_bound");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
@@ -436,7 +436,7 @@ public class GenericPropertyFunctionTest {
//Blank nodes limit a value check.
int expResult = 6;
int result = objects.size();
- //System.out.println("Objects: " + objects);
+ //
assertEquals(expResult, result);
}
@@ -445,7 +445,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_subject_bound_geometry() {
- System.out.println("execEvaluated_subject_bound");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
@@ -470,9 +470,9 @@ public class GenericPropertyFunctionTest {
int expResult = 7;
int result = objects.size();
- System.out.println("Exp: " + expResult);
- System.out.println("Res: " + result);
- System.out.println("Objects: " + objects);
+
+
+
assertEquals(expResult, result);
}
@@ -481,7 +481,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_object_bound() {
- System.out.println("execEvaluated_object_bound");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
@@ -504,8 +504,8 @@ public class GenericPropertyFunctionTest {
List<Resource> expResults = Arrays.asList(FEATURE_A, FEATURE_B, GEOMETRY_A, GEOMETRY_B);
- //System.out.println("Exp: " + expResults);
- //System.out.println("Res: " + results);
+ //
+ //
assertEquals(expResults, results);
}
@@ -514,7 +514,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_both_bound() {
- System.out.println("execEvaluated_both_bound");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
@@ -551,7 +551,7 @@ public class GenericPropertyFunctionTest {
*/
@Test
public void testExecEvaluated_both_bound_geo() {
- System.out.println("execEvaluated_both_bound_geo");
+
String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ "\n"
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
index 9ff149e..2f2844b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
@@ -67,7 +67,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieve() {
- System.out.println("retrieve");
+
Graph graph = MODEL.getGraph();
Node targetSpatialObject = null;
@@ -83,7 +83,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieveGeometryLiteral_geometry() {
- System.out.println("retrieve_geometry");
+
Graph graph = MODEL.getGraph();
Resource targetSpatialObject = GEOMETRY_B;
@@ -97,7 +97,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieveGeometryLiteral_feature() {
- System.out.println("retrieve_feature");
+
Resource targetSpatialObject = FEATURE_B;
SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(FEATURE_B.asNode(), LITERAL_B.asNode());
@@ -110,7 +110,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieveGeometryLiteral_missing_property() {
- System.out.println("retrieve_missing_property");
+
Resource targetSpatialObject = ResourceFactory.createResource("http://example.org#GeometryE");
@@ -126,7 +126,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieveGeometryLiteral_not_feature_geometry() {
- System.out.println("retrieve_not_feature_geometry");
+
Resource targetSpatialObject = ResourceFactory.createResource("http://example.org#X");
@@ -142,7 +142,7 @@ public class SpatialObjectGeometryLiteralTest {
*/
@Test
public void testRetrieveGeometryLiteral_feature_lat_lon() {
- System.out.println("retrieve_feature");
+
Resource targetSpatialObject = GEO_FEATURE_Y;
SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(GEO_FEATURE_Y.asNode(), GEO_FEATURE_LITERAL.asNode());
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
index f76cb37..52a7c01 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
@@ -54,7 +54,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class EhContainsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
index 4f19c51..d140e87 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
@@ -56,7 +56,7 @@ public class EhCoveredByPFTest {
//No Polygon-Linestring
@Test
public void testFilterFunction_point_polygon() {
- System.out.println("filterFunction_point_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class EhCoveredByPFTest {
@Test
public void testFilterFunction_linestring_polygon() {
- System.out.println("filterFunction_linestring_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -84,7 +84,7 @@ public class EhCoveredByPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -98,7 +98,7 @@ public class EhCoveredByPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -112,7 +112,7 @@ public class EhCoveredByPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -126,7 +126,7 @@ public class EhCoveredByPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
index 7a6036e..1ce3a4d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
@@ -56,7 +56,7 @@ public class EhCoversPFTest {
//No Polygon-Linestring
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class EhCoversPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -84,7 +84,7 @@ public class EhCoversPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -98,7 +98,7 @@ public class EhCoversPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
index b59e95e..2856cef 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
@@ -54,7 +54,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(10 25, 50 25)", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class EhDisjointPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
index 36c2a11..9756884 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
@@ -55,7 +55,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_point_point() {
- System.out.println("filterFunction_point_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_linestring_linestring() {
- System.out.println("filterFunction_linestring_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
@@ -83,7 +83,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -97,7 +97,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_point_point_false() {
- System.out.println("filterFunction_point_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(65 65)", WKTDatatype.INSTANCE);
@@ -111,7 +111,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_linestring_linestring_false() {
- System.out.println("filterFunction_linestring_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(50 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
@@ -125,7 +125,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -139,7 +139,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -153,7 +153,7 @@ public class EhEqualsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -170,7 +170,7 @@ public class EhEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyGML() {
- System.out.println("filterFunction_emptyWKT_emptyGML");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyGML = GeometryWrapper.getEmptyGML().asLiteral();
@@ -187,7 +187,7 @@ public class EhEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyWKT() {
- System.out.println("filterFunction_empty_empty");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyWKT2 = GeometryWrapper.getEmptyWKT().asLiteral();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
index ca97a40..d8fb49c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
@@ -56,7 +56,7 @@ public class EhInsidePFTest {
//No Polygon-Linestring
@Test
public void testFilterFunction_point_polygon() {
- System.out.println("filterFunction_point_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_linestring_polygon() {
- System.out.println("filterFunction_linestring_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -84,7 +84,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -98,7 +98,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_point_polygon_false() {
- System.out.println("filterFunction_point_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(0 0)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -112,7 +112,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_linestring_polygon_false() {
- System.out.println("filterFunction_linestring_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50, 100 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -126,7 +126,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -140,7 +140,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -154,7 +154,7 @@ public class EhInsidePFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
index bbfc469..ff90cad 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
@@ -56,7 +56,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE);
@@ -84,7 +84,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -98,7 +98,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -112,7 +112,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -126,7 +126,7 @@ public class EhMeetPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
index 74aa2d6..c476ee7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
@@ -59,7 +59,7 @@ public class EhOverlapPFTest {
//No Polygon-Point
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -73,7 +73,7 @@ public class EhOverlapPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
@@ -87,7 +87,7 @@ public class EhOverlapPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -101,7 +101,7 @@ public class EhOverlapPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -115,7 +115,7 @@ public class EhOverlapPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
index a2ed96d..ec0c496 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
@@ -57,7 +57,7 @@ public class CoordinateDimensionPFTest {
*/
@Test
public void testApplyPredicate_2_Dimension() {
- System.out.println("applyPredicate_2_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.URI);
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -70,7 +70,7 @@ public class CoordinateDimensionPFTest {
*/
@Test
public void testApplyPredicate_3Z_Dimension() {
- System.out.println("applyPredicate_3Z_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT Z (90 60 30)", WKTDatatype.URI);
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -83,7 +83,7 @@ public class CoordinateDimensionPFTest {
*/
@Test
public void testApplyPredicate_3M_Dimension() {
- System.out.println("applyPredicate_3M_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT M (90 60 30)", WKTDatatype.URI);
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -96,7 +96,7 @@ public class CoordinateDimensionPFTest {
*/
@Test
public void testApplyPredicate_4_Dimension() {
- System.out.println("applyPredicate_4_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT ZM (90 60 30 10)", WKTDatatype.URI);
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(4);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
index 0b15ae2..9e9d0e7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
@@ -57,7 +57,7 @@ public class DimensionPFTest {
*/
@Test
public void testApplyPredicate_0_Dimension() {
- System.out.println("applyPredicate_0_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.URI);
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(0);
@@ -70,7 +70,7 @@ public class DimensionPFTest {
*/
@Test
public void testApplyPredicate_1_Dimension() {
- System.out.println("applyPredicate_1_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(90 60, 100 70)", WKTDatatype.URI);
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(1);
@@ -83,7 +83,7 @@ public class DimensionPFTest {
*/
@Test
public void testApplyPredicate_2_Dimension() {
- System.out.println("applyPredicate_2_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))", WKTDatatype.URI);
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
index efd91ff..1de39c1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
@@ -57,7 +57,7 @@ public class IsEmptyPFTest {
*/
@Test
public void testApplyPredicate_false() {
- System.out.println("applyPredicate_false");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.URI);
IsEmptyPF instance = new IsEmptyPF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
@@ -70,7 +70,7 @@ public class IsEmptyPFTest {
*/
@Test
public void testApplyPredicate_true() {
- System.out.println("applyPredicate_true");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT EMPTY", WKTDatatype.URI);
IsEmptyPF instance = new IsEmptyPF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
index 611627c..0f07564 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
@@ -57,7 +57,7 @@ public class IsSimplePFTest {
*/
@Test
public void testApplyPredicate_true() {
- System.out.println("applyPredicate_true");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(90 60, 100 70)", WKTDatatype.URI);
IsSimplePF instance = new IsSimplePF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
@@ -70,7 +70,7 @@ public class IsSimplePFTest {
*/
@Test
public void testApplyPredicate_false() {
- System.out.println("applyPredicate_false");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10, 10 5, 0 5)", WKTDatatype.URI);
IsSimplePF instance = new IsSimplePF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
index 6305902..5140d93 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
@@ -57,7 +57,7 @@ public class IsValidPFTest {
*/
@Test
public void testApplyPredicate_true() {
- System.out.println("applyPredicate_true");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 1 1)", WKTDatatype.URI);
IsValidPF instance = new IsValidPF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
@@ -70,7 +70,7 @@ public class IsValidPFTest {
*/
@Test
public void testApplyPredicate_false() {
- System.out.println("applyPredicate_false");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 0 0, 0 0)", WKTDatatype.URI);
IsValidPF instance = new IsValidPF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
index 06a40e4..96594c8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
@@ -57,7 +57,7 @@ public class SpatialDimensionPFTest {
*/
@Test
public void testApplyPredicate_2_Dimension() {
- System.out.println("applyPredicate_2_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.URI);
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -70,7 +70,7 @@ public class SpatialDimensionPFTest {
*/
@Test
public void testApplyPredicate_3_Dimension() {
- System.out.println("applyPredicate_3_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT Z (90 60 30)", WKTDatatype.URI);
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -83,7 +83,7 @@ public class SpatialDimensionPFTest {
*/
@Test
public void testApplyPredicate_2M_Dimension() {
- System.out.println("applyPredicate_2M_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT M (90 60 30)", WKTDatatype.URI);
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -96,7 +96,7 @@ public class SpatialDimensionPFTest {
*/
@Test
public void testApplyPredicate_3M_Dimension() {
- System.out.println("applyPredicate_3M_Dimension");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT ZM (90 60 30 10)", WKTDatatype.URI);
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
index 356baa5..f812f84 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
@@ -55,7 +55,7 @@ public class RccDisconnectedPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class RccDisconnectedPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
index a58a2b7..648c073 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
@@ -56,7 +56,7 @@ public class RccEqualsPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class RccEqualsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -87,7 +87,7 @@ public class RccEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyGML() {
- System.out.println("filterFunction_emptyWKT_emptyGML");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyGML = GeometryWrapper.getEmptyGML().asLiteral();
@@ -104,7 +104,7 @@ public class RccEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyWKT() {
- System.out.println("filterFunction_empty_empty");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyWKT2 = GeometryWrapper.getEmptyWKT().asLiteral();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
index 1d36830..d8da135 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
@@ -54,7 +54,7 @@ public class RccExternallyConnectedPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class RccExternallyConnectedPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
index 2b47c77..d96460b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
@@ -54,7 +54,7 @@ public class RccNonTangentialProperPartInversePFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class RccNonTangentialProperPartInversePFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
index 272cb11..4c27da7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
@@ -54,7 +54,7 @@ public class RccNonTangentialProperPartPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class RccNonTangentialProperPartPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
index d4928d8..e820b27 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
@@ -54,7 +54,7 @@ public class RccPartiallyOverlappingPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class RccPartiallyOverlappingPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
index f3ed862..9d121e7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
@@ -55,7 +55,7 @@ public class RccTangentialProperPartInversePFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class RccTangentialProperPartInversePFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
index e62a10f..1b65fe3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
@@ -55,7 +55,7 @@ public class RccTangentialProperPartPFTest {
//Only Polygon-Polygon
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class RccTangentialProperPartPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
index 81571ea..4286c5b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
@@ -54,7 +54,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class SfContainsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
index 3f8a240..89718fa 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
@@ -58,7 +58,7 @@ public class SfCrossesPFTest {
//Point-Linestring returns false. Have to compare with a set of points.
@Test
public void testFilterFunction_multipoint_linestring() {
- System.out.println("filterFunction_multipoint_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(90 60, 10 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -73,7 +73,7 @@ public class SfCrossesPFTest {
//Point-Polygon returns false. Have to compare with a set of points.
@Test
public void testFilterFunction_multipoint_polygon() {
- System.out.println("filterFunction_multipoint_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -87,7 +87,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_linestring_linestring() {
- System.out.println("filterFunction_linestring_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -101,7 +101,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_linestring_polygon() {
- System.out.println("filterFunction_linestring_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -115,7 +115,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_multipoint_linestring_false() {
- System.out.println("filterFunction_multipoint_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(90 60, 80 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -129,7 +129,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_multipoint_polygon_false() {
- System.out.println("filterFunction_multipoint_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 65 65)", WKTDatatype.INSTANCE);
@@ -143,7 +143,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_linestring_linestring_false() {
- System.out.println("filterFunction_linestring_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
@@ -157,7 +157,7 @@ public class SfCrossesPFTest {
@Test
public void testFilterFunction_linestring_polygon_false() {
- System.out.println("filterFunction_linestring_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
index 78b9e39..f32fdf7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
@@ -54,7 +54,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(20 20)", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 50, 0 50)", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class SfDisjointPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
index eb936b7..ef7a6f5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
@@ -55,7 +55,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_point_point() {
- System.out.println("filterFunction_point_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_linestring_linestring() {
- System.out.println("filterFunction_linestring_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
@@ -83,7 +83,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -97,7 +97,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_point_point_false() {
- System.out.println("filterFunction_point_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(65 65)", WKTDatatype.INSTANCE);
@@ -111,7 +111,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_linestring_linestring_false() {
- System.out.println("filterFunction_linestring_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(50 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE);
@@ -125,7 +125,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -139,7 +139,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -153,7 +153,7 @@ public class SfEqualsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -170,7 +170,7 @@ public class SfEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyGML() {
- System.out.println("filterFunction_emptyWKT_emptyGML");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyGML = GeometryWrapper.getEmptyGML().asLiteral();
@@ -187,7 +187,7 @@ public class SfEqualsPFTest {
*/
@Test
public void testFilterFunction_emptyWKT_emptyWKT() {
- System.out.println("filterFunction_empty_empty");
+
Literal emptyWKT = GeometryWrapper.getEmptyWKT().asLiteral();
Literal emptyWKT2 = GeometryWrapper.getEmptyWKT().asLiteral();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
index c6ddfc8..245fd80 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
@@ -54,7 +54,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 30, 145 30)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class SfIntersectsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
index db4e642..9911953 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
@@ -56,7 +56,7 @@ public class SfOverlapsPFTest {
//Point-Point returns false. Have to compare two sets of points.
@Test
public void testFilterFunction_multipoint_multipoint() {
- System.out.println("filterFunction_multipoint_multipoint");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 10 10)", WKTDatatype.INSTANCE);
@@ -70,7 +70,7 @@ public class SfOverlapsPFTest {
@Test
public void testFilterFunction_linestring_linestring() {
- System.out.println("filterFunction_linestring_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 20, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE);
@@ -84,7 +84,7 @@ public class SfOverlapsPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -98,7 +98,7 @@ public class SfOverlapsPFTest {
@Test
public void testFilterFunction_point_point_false() {
- System.out.println("filterFunction_point_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE);
@@ -112,7 +112,7 @@ public class SfOverlapsPFTest {
@Test
public void testFilterFunction_linestring_linestring_false() {
- System.out.println("filterFunction_linestring_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 20, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -126,7 +126,7 @@ public class SfOverlapsPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
index 19de489..678938a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
@@ -55,7 +55,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE);
@@ -83,7 +83,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -97,7 +97,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -111,7 +111,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -125,7 +125,7 @@ public class SfTouchesPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
index e03aad6..596b2b4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
@@ -54,7 +54,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_point() {
- System.out.println("filterFunction_polygon_point");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -68,7 +68,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_linestring() {
- System.out.println("filterFunction_polygon_linestring");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_polygon() {
- System.out.println("filterFunction_polygon_polygon");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
@@ -96,7 +96,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_point_false() {
- System.out.println("filterFunction_polygon_point_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE);
@@ -110,7 +110,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_linestring_false() {
- System.out.println("filterFunction_polygon_linestring_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE);
@@ -124,7 +124,7 @@ public class SfWithinPFTest {
@Test
public void testFilterFunction_polygon_polygon_false() {
- System.out.println("filterFunction_polygon_polygon_false");
+
Literal subjectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
Literal objectGeometryLiteral = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
index 76e4224..2347be9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
@@ -56,7 +56,7 @@ public class BoundaryFFTest {
*/
@Test
public void testExec_CRS84() {
- System.out.println("exec_CRS84");
+
NodeValue v = NodeValue.makeNode("POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
BoundaryFF instance = new BoundaryFF();
@@ -70,7 +70,7 @@ public class BoundaryFFTest {
*/
@Test
public void testExec_WGS84() {
- System.out.println("exec_WGS84");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
BoundaryFF instance = new BoundaryFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
index a7de18b..b0d0abd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
@@ -64,7 +64,7 @@ public class BufferFFTest {
*/
@Test
public void testExec_Projection_Linear() {
- System.out.println("exec_Projection_Linear");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeDecimal(20);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.METRE_URL));
@@ -79,7 +79,7 @@ public class BufferFFTest {
*/
@Test
public void testExec_Projection_NonLinear() {
- System.out.println("exec_Projection_NonLinear");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeDecimal(0.0002);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.DEGREE_URL));
@@ -94,7 +94,7 @@ public class BufferFFTest {
*/
@Test
public void testExec_Geographic_Linear() {
- System.out.println("exec_Geographic_Linear");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.9 -7.5, 50.0 -7.5, 50.0 -7.4, 49.9 -7.4, 49.9 -7.5))", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeDecimal(20);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.METRE_URL));
@@ -112,7 +112,7 @@ public class BufferFFTest {
*/
@Test
public void testExec_Geographic_Linear2() throws MismatchedDimensionException, TransformException, FactoryException {
- System.out.println("exec_Geographic_Linear2");
+
//Test that buffering with Geographic geometry and Linear distance yields similar results to Projected geometry and Linear distance.
GeometryWrapper originalGeometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0.0 0.0, 0.0 100.0, 100.0 100.0, 100.0 0.0, 0.0 0.0))", WKTDatatype.URI);
@@ -156,8 +156,8 @@ public class BufferFFTest {
j++;
}
- //System.out.println("Exp: " + Arrays.toString(expResults));
- //System.out.println("Res: " + Arrays.toString(results));
+ //
+ //
//Test accuracy of buffering to within 0.1m. Some error from coordinate transformations.
Assert.assertArrayEquals(expResults, results, 0.1);
}
@@ -167,7 +167,7 @@ public class BufferFFTest {
*/
@Test
public void testExec_Geographic_NonLinear() {
- System.out.println("exec_Geographic_NonLinear");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.9 -7.5, 50.0 -7.5, 50.0 -7.4, 49.9 -7.4, 49.9 -7.5))", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeDecimal(0.0002);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.DEGREE_URL));
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
index 3355eaa..7930239 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
@@ -56,7 +56,7 @@ public class ConvexHullFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10, 0 5)", WKTDatatype.INSTANCE);
ConvexHullFF instance = new ConvexHullFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 5, 10 10, 0 0))", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class ConvexHullFFTest {
*/
@Test
public void testExec2() {
- System.out.println("exec2");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10, 5 5)", WKTDatatype.INSTANCE);
ConvexHullFF instance = new ConvexHullFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10)", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
index feffe37..ff0e133 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
@@ -56,7 +56,7 @@ public class DifferenceFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE);
DifferenceFF instance = new DifferenceFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
index 1f470bb..36dd791 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
@@ -58,7 +58,7 @@ public class DistanceFFTest {
*/
@Test
public void testExec_metres() {
- System.out.println("exec_metres");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.METRE_URL));
@@ -73,7 +73,7 @@ public class DistanceFFTest {
*/
@Test
public void testExec_radians() {
- System.out.println("exec_radians");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
NodeValue v3 = NodeValue.makeNode(NodeFactory.createURI(Unit_URI.RADIAN_URL));
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
index b48b1e3..b2061c4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
@@ -56,7 +56,7 @@ public class EnvelopFFTest {
*/
@Test
public void testExec_point() {
- System.out.println("exec_point");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10 10)", WKTDatatype.INSTANCE);
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10 10)", WKTDatatype.INSTANCE);
@@ -69,7 +69,7 @@ public class EnvelopFFTest {
*/
@Test
public void testExec_linestring() {
- System.out.println("exec_linestring");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10, 5 5)", WKTDatatype.INSTANCE);
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
@@ -82,7 +82,7 @@ public class EnvelopFFTest {
*/
@Test
public void testExec_polygon() {
- System.out.println("exec_polygon");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
index ddea7cc..d1c380d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
@@ -57,7 +57,7 @@ public class GetSRIDFFTest {
*/
@Test
public void testExec_asserted() {
- System.out.println("exec_asserted");
+
NodeValue v = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10 10)", WKTDatatype.INSTANCE);
GetSRIDFF instance = new GetSRIDFF();
NodeValue expResult = NodeValue.makeString("http://www.opengis.net/def/crs/EPSG/0/27700");
@@ -70,7 +70,7 @@ public class GetSRIDFFTest {
*/
@Test
public void testExec_implied() {
- System.out.println("exec_implied");
+
NodeValue v = NodeValue.makeNode("POINT(10 10)", WKTDatatype.INSTANCE);
GetSRIDFF instance = new GetSRIDFF();
NodeValue expResult = NodeValue.makeString(SRS_URI.DEFAULT_WKT_CRS84);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
index d53b14a..6b1dcff 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
@@ -56,7 +56,7 @@ public class IntersectionFFTest {
*/
@Test
public void testExec_point_polygon() {
- System.out.println("exec_point_polygon");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 70)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
IntersectionFF instance = new IntersectionFF();
@@ -70,7 +70,7 @@ public class IntersectionFFTest {
*/
@Test
public void testExec_linestring_polygon() {
- System.out.println("exec_linestring_polygon");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
IntersectionFF instance = new IntersectionFF();
@@ -84,7 +84,7 @@ public class IntersectionFFTest {
*/
@Test
public void testExec_linestring_polygon_empty() {
- System.out.println("exec_linestring_polygon_empty");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 0 30)", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
IntersectionFF instance = new IntersectionFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
index e996362..26c41c6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
@@ -56,7 +56,7 @@ public class SymmetricDifferenceFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec_linestring_polygon");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> Polygon((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> Polygon((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
SymmetricDifferenceFF instance = new SymmetricDifferenceFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
index 2955049..ac641f8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
@@ -56,7 +56,7 @@ public class UnionFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec_linestring_polygon");
+
NodeValue v1 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> Polygon((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE);
NodeValue v2 = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> Polygon((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE);
UnionFF instance = new UnionFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
index 98efdb1..69dea29 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
@@ -58,7 +58,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class EhContainsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class EhContainsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhContainsFF instance = new EhContainsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class EhContainsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhContainsFF instance = new EhContainsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhContainsFF instance = new EhContainsFF();
@@ -183,7 +183,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhContainsFF instance = new EhContainsFF();
@@ -197,7 +197,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhContainsFF instance = new EhContainsFF();
@@ -211,7 +211,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhContainsFF instance = new EhContainsFF();
@@ -225,7 +225,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhContainsFF instance = new EhContainsFF();
@@ -239,7 +239,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhContainsFF instance = new EhContainsFF();
@@ -253,7 +253,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhContainsFF instance = new EhContainsFF();
@@ -267,7 +267,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhContainsFF instance = new EhContainsFF();
@@ -281,7 +281,7 @@ public class EhContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhContainsFF instance = new EhContainsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
index eec1e8e..167b15b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
@@ -60,7 +60,7 @@ public class EhCoveredByFFTest {
//No Polygon-Linestring
@Test
public void testRelate_point_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -74,7 +74,7 @@ public class EhCoveredByFFTest {
@Test
public void testRelate_linestring_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -88,7 +88,7 @@ public class EhCoveredByFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -102,7 +102,7 @@ public class EhCoveredByFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -116,7 +116,7 @@ public class EhCoveredByFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -130,7 +130,7 @@ public class EhCoveredByFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -147,7 +147,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -159,7 +159,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -171,7 +171,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -185,7 +185,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -199,7 +199,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -213,7 +213,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -227,7 +227,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -241,7 +241,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -255,7 +255,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -269,7 +269,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoveredByFF instance = new EhCoveredByFF();
@@ -283,7 +283,7 @@ public class EhCoveredByFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoveredByFF instance = new EhCoveredByFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
index 2cbcd8d..e5686ed 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
@@ -60,7 +60,7 @@ public class EhCoversFFTest {
//No Polygon-Linestring
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE));
@@ -74,7 +74,7 @@ public class EhCoversFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -88,7 +88,7 @@ public class EhCoversFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -102,7 +102,7 @@ public class EhCoversFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -119,7 +119,7 @@ public class EhCoversFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -131,7 +131,7 @@ public class EhCoversFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -143,7 +143,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoversFF instance = new EhCoversFF();
@@ -157,7 +157,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoversFF instance = new EhCoversFF();
@@ -171,7 +171,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoversFF instance = new EhCoversFF();
@@ -185,7 +185,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoversFF instance = new EhCoversFF();
@@ -199,7 +199,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoversFF instance = new EhCoversFF();
@@ -213,7 +213,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoversFF instance = new EhCoversFF();
@@ -227,7 +227,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhCoversFF instance = new EhCoversFF();
@@ -241,7 +241,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhCoversFF instance = new EhCoversFF();
@@ -255,7 +255,7 @@ public class EhCoversFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhCoversFF instance = new EhCoversFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
index 004fe96..c8ad0b8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
@@ -58,7 +58,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(10 25, 50 25)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class EhDisjointFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhDisjointFF instance = new EhDisjointFF();
@@ -183,7 +183,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhDisjointFF instance = new EhDisjointFF();
@@ -197,7 +197,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhDisjointFF instance = new EhDisjointFF();
@@ -211,7 +211,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhDisjointFF instance = new EhDisjointFF();
@@ -225,7 +225,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhDisjointFF instance = new EhDisjointFF();
@@ -239,7 +239,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhDisjointFF instance = new EhDisjointFF();
@@ -253,7 +253,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhDisjointFF instance = new EhDisjointFF();
@@ -267,7 +267,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhDisjointFF instance = new EhDisjointFF();
@@ -281,7 +281,7 @@ public class EhDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhDisjointFF instance = new EhDisjointFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
index abc0220..2eefe63 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
@@ -58,7 +58,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_point_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_linestring_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_point_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(65 65)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_linestring_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(50 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -142,7 +142,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -156,7 +156,7 @@ public class EhEqualsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -173,7 +173,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -185,7 +185,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -197,7 +197,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhEqualsFF instance = new EhEqualsFF();
@@ -211,7 +211,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhEqualsFF instance = new EhEqualsFF();
@@ -225,7 +225,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhEqualsFF instance = new EhEqualsFF();
@@ -239,7 +239,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhEqualsFF instance = new EhEqualsFF();
@@ -253,7 +253,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhEqualsFF instance = new EhEqualsFF();
@@ -267,7 +267,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhEqualsFF instance = new EhEqualsFF();
@@ -281,7 +281,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhEqualsFF instance = new EhEqualsFF();
@@ -295,7 +295,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhEqualsFF instance = new EhEqualsFF();
@@ -309,7 +309,7 @@ public class EhEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhEqualsFF instance = new EhEqualsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
index bb7271b..1f8b207 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
@@ -60,7 +60,7 @@ public class EhInsideFFTest {
//No Polygon-Linestring
@Test
public void testRelate_point_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -74,7 +74,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_linestring_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -88,7 +88,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -102,7 +102,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_point_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(0 0)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -116,7 +116,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_linestring_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50, 100 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -130,7 +130,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -144,7 +144,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -158,7 +158,7 @@ public class EhInsideFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -175,7 +175,7 @@ public class EhInsideFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhInsideFF instance = new EhInsideFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -187,7 +187,7 @@ public class EhInsideFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhInsideFF instance = new EhInsideFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -199,7 +199,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhInsideFF instance = new EhInsideFF();
@@ -213,7 +213,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhInsideFF instance = new EhInsideFF();
@@ -227,7 +227,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhInsideFF instance = new EhInsideFF();
@@ -241,7 +241,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhInsideFF instance = new EhInsideFF();
@@ -255,7 +255,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhInsideFF instance = new EhInsideFF();
@@ -269,7 +269,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhInsideFF instance = new EhInsideFF();
@@ -283,7 +283,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhInsideFF instance = new EhInsideFF();
@@ -297,7 +297,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhInsideFF instance = new EhInsideFF();
@@ -311,7 +311,7 @@ public class EhInsideFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhInsideFF instance = new EhInsideFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
index c7cfa65..a5d1ff8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
@@ -60,7 +60,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE));
@@ -74,7 +74,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE));
@@ -88,7 +88,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -102,7 +102,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -116,7 +116,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -130,7 +130,7 @@ public class EhMeetFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -147,7 +147,7 @@ public class EhMeetFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhMeetFF instance = new EhMeetFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -159,7 +159,7 @@ public class EhMeetFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhMeetFF instance = new EhMeetFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -171,7 +171,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhMeetFF instance = new EhMeetFF();
@@ -185,7 +185,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhMeetFF instance = new EhMeetFF();
@@ -199,7 +199,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhMeetFF instance = new EhMeetFF();
@@ -213,7 +213,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhMeetFF instance = new EhMeetFF();
@@ -227,7 +227,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhMeetFF instance = new EhMeetFF();
@@ -241,7 +241,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhMeetFF instance = new EhMeetFF();
@@ -255,7 +255,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhMeetFF instance = new EhMeetFF();
@@ -269,7 +269,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhMeetFF instance = new EhMeetFF();
@@ -283,7 +283,7 @@ public class EhMeetFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhMeetFF instance = new EhMeetFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
index 9649842..89df108 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
@@ -63,7 +63,7 @@ public class EhOverlapFFTest {
//No Polygon-Point
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -77,7 +77,7 @@ public class EhOverlapFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -91,7 +91,7 @@ public class EhOverlapFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -105,7 +105,7 @@ public class EhOverlapFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -119,7 +119,7 @@ public class EhOverlapFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -136,7 +136,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -148,7 +148,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -160,7 +160,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhOverlapFF instance = new EhOverlapFF();
@@ -174,7 +174,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhOverlapFF instance = new EhOverlapFF();
@@ -188,7 +188,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhOverlapFF instance = new EhOverlapFF();
@@ -202,7 +202,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhOverlapFF instance = new EhOverlapFF();
@@ -216,7 +216,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhOverlapFF instance = new EhOverlapFF();
@@ -230,7 +230,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhOverlapFF instance = new EhOverlapFF();
@@ -244,7 +244,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
EhOverlapFF instance = new EhOverlapFF();
@@ -258,7 +258,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
EhOverlapFF instance = new EhOverlapFF();
@@ -272,7 +272,7 @@ public class EhOverlapFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
EhOverlapFF instance = new EhOverlapFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
index c58d2a1..dc1f1fe 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
@@ -56,7 +56,7 @@ public class CoordinateDimensionFFTest {
*/
@Test
public void testExec_2_Dimension() {
- System.out.println("exec_2_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -69,7 +69,7 @@ public class CoordinateDimensionFFTest {
*/
@Test
public void testExec_3Z_Dimension() {
- System.out.println("exec_3Z_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT Z (90 60 30)", WKTDatatype.INSTANCE);
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -82,7 +82,7 @@ public class CoordinateDimensionFFTest {
*/
@Test
public void testExec_3M_Dimension() {
- System.out.println("exec_3M_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT M (90 60 30)", WKTDatatype.INSTANCE);
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -95,7 +95,7 @@ public class CoordinateDimensionFFTest {
*/
@Test
public void testExec_4_Dimension() {
- System.out.println("exec_4_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT ZM (90 60 30 10)", WKTDatatype.INSTANCE);
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(4);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
index d94b866..2cc5d28 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
@@ -56,7 +56,7 @@ public class DimensionFFTest {
*/
@Test
public void testExec_0_Dimension() {
- System.out.println("exec_0_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(0);
@@ -69,7 +69,7 @@ public class DimensionFFTest {
*/
@Test
public void testExec_1_Dimension() {
- System.out.println("exec_1_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(90 60, 100 70)", WKTDatatype.INSTANCE);
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(1);
@@ -82,7 +82,7 @@ public class DimensionFFTest {
*/
@Test
public void testExec_2_Dimension() {
- System.out.println("exec_2_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))", WKTDatatype.INSTANCE);
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
index 500b386..b4c3e2f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
@@ -56,7 +56,7 @@ public class IsEmptyFFTest {
*/
@Test
public void testExec_false() {
- System.out.println("exec_false");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
IsEmptyFF instance = new IsEmptyFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
@@ -69,7 +69,7 @@ public class IsEmptyFFTest {
*/
@Test
public void testExec_true() {
- System.out.println("exec_true");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT EMPTY", WKTDatatype.INSTANCE);
IsEmptyFF instance = new IsEmptyFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
index b2a9012..64da7b2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
@@ -56,7 +56,7 @@ public class IsSimpleFFTest {
*/
@Test
public void testExec_true() {
- System.out.println("exec_true");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(90 60, 100 70)", WKTDatatype.INSTANCE);
IsSimpleFF instance = new IsSimpleFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
@@ -69,7 +69,7 @@ public class IsSimpleFFTest {
*/
@Test
public void testExec_false() {
- System.out.println("exec_false");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10, 10 5, 0 5)", WKTDatatype.INSTANCE);
IsSimpleFF instance = new IsSimpleFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
index a625712..e428d6d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
@@ -56,7 +56,7 @@ public class IsValidFFTest {
*/
@Test
public void testExec_true() {
- System.out.println("exec_true");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 1 1)", WKTDatatype.INSTANCE);
IsValidFF instance = new IsValidFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
@@ -69,7 +69,7 @@ public class IsValidFFTest {
*/
@Test
public void testExec_false() {
- System.out.println("exec_false");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 0 0, 0 0)", WKTDatatype.INSTANCE);
IsValidFF instance = new IsValidFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
index ac6393b..6ac9628 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
@@ -56,7 +56,7 @@ public class SpatialDimensionFFTest {
*/
@Test
public void testExec_2_Dimension() {
- System.out.println("exec_2_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE);
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -69,7 +69,7 @@ public class SpatialDimensionFFTest {
*/
@Test
public void testExec_3_Dimension() {
- System.out.println("exec_3_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT Z (90 60 30)", WKTDatatype.INSTANCE);
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
@@ -82,7 +82,7 @@ public class SpatialDimensionFFTest {
*/
@Test
public void testExec_2M_Dimension() {
- System.out.println("exec_2M_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT M (90 60 30)", WKTDatatype.INSTANCE);
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
@@ -95,7 +95,7 @@ public class SpatialDimensionFFTest {
*/
@Test
public void testExec_3M_Dimension() {
- System.out.println("exec_3M_Dimension");
+
NodeValue geometryLiteral = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT ZM (90 60 30 10)", WKTDatatype.INSTANCE);
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
index ef30593..02e6d5d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
@@ -59,7 +59,7 @@ public class RccDisconnectedFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -73,7 +73,7 @@ public class RccDisconnectedFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -90,7 +90,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
@@ -102,7 +102,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = true;
boolean result = instance.isDisconnected();
@@ -114,7 +114,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -128,7 +128,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -142,7 +142,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -156,7 +156,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -170,7 +170,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -184,7 +184,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -198,7 +198,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -212,7 +212,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccDisconnectedFF instance = new RccDisconnectedFF();
@@ -226,7 +226,7 @@ public class RccDisconnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccDisconnectedFF instance = new RccDisconnectedFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
index 37bafb1..a75e180 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
@@ -59,7 +59,7 @@ public class RccEqualsFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -73,7 +73,7 @@ public class RccEqualsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -90,7 +90,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -102,7 +102,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -114,7 +114,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccEqualsFF instance = new RccEqualsFF();
@@ -128,7 +128,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccEqualsFF instance = new RccEqualsFF();
@@ -142,7 +142,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccEqualsFF instance = new RccEqualsFF();
@@ -156,7 +156,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccEqualsFF instance = new RccEqualsFF();
@@ -170,7 +170,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccEqualsFF instance = new RccEqualsFF();
@@ -184,7 +184,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccEqualsFF instance = new RccEqualsFF();
@@ -198,7 +198,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccEqualsFF instance = new RccEqualsFF();
@@ -212,7 +212,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccEqualsFF instance = new RccEqualsFF();
@@ -226,7 +226,7 @@ public class RccEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccEqualsFF instance = new RccEqualsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
index 5d451d2..8925168 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
@@ -58,7 +58,7 @@ public class RccExternallyConnectedFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class RccExternallyConnectedFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -89,7 +89,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -101,7 +101,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -113,7 +113,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -127,7 +127,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -141,7 +141,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -155,7 +155,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -169,7 +169,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -183,7 +183,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -197,7 +197,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -211,7 +211,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
@@ -225,7 +225,7 @@ public class RccExternallyConnectedFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
index 6283a23..0de871b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
@@ -58,7 +58,7 @@ public class RccNonTangentialProperPartFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class RccNonTangentialProperPartFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -89,7 +89,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -101,7 +101,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -113,7 +113,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -127,7 +127,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -141,7 +141,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -155,7 +155,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -169,7 +169,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -183,7 +183,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -197,7 +197,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -211,7 +211,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
@@ -225,7 +225,7 @@ public class RccNonTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
index da8875a..71c0304 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
@@ -58,7 +58,7 @@ public class RccNonTangentialProperPartInverseFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class RccNonTangentialProperPartInverseFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -89,7 +89,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -102,7 +102,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -115,7 +115,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -130,7 +130,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -145,7 +145,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -160,7 +160,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -175,7 +175,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -190,7 +190,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -205,7 +205,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -220,7 +220,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
@@ -235,7 +235,7 @@ public class RccNonTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
index 9e6bd0e..d50ad41 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
@@ -58,7 +58,7 @@ public class RccPartiallyOverlappingFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class RccPartiallyOverlappingFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -89,7 +89,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -101,7 +101,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -113,7 +113,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -127,7 +127,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -141,7 +141,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -155,7 +155,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -169,7 +169,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -183,7 +183,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -197,7 +197,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -211,7 +211,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
@@ -225,7 +225,7 @@ public class RccPartiallyOverlappingFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
index 64f602f..a07a4db 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
@@ -59,7 +59,7 @@ public class RccTangentialProperPartFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -73,7 +73,7 @@ public class RccTangentialProperPartFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -90,7 +90,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -102,7 +102,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -114,7 +114,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -128,7 +128,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -142,7 +142,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -156,7 +156,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -170,7 +170,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -184,7 +184,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -198,7 +198,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -212,7 +212,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
@@ -226,7 +226,7 @@ public class RccTangentialProperPartFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
index 0b45d81..adc836d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
@@ -59,7 +59,7 @@ public class RccTangentialProperPartInverseFFTest {
//Only Polygon-Polygon
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 48, 45 48, 45 40, 30 40))", WKTDatatype.INSTANCE));
@@ -73,7 +73,7 @@ public class RccTangentialProperPartInverseFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
@@ -90,7 +90,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -102,7 +102,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -115,7 +115,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -130,7 +130,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -145,7 +145,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -160,7 +160,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -175,7 +175,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -190,7 +190,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -205,7 +205,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -220,7 +220,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
@@ -235,7 +235,7 @@ public class RccTangentialProperPartInverseFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
index dac6b08..d28f1ae 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
@@ -58,7 +58,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class SfContainsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class SfContainsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfContainsFF instance = new SfContainsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class SfContainsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfContainsFF instance = new SfContainsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfContainsFF instance = new SfContainsFF();
@@ -183,7 +183,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfContainsFF instance = new SfContainsFF();
@@ -197,7 +197,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfContainsFF instance = new SfContainsFF();
@@ -211,7 +211,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfContainsFF instance = new SfContainsFF();
@@ -225,7 +225,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfContainsFF instance = new SfContainsFF();
@@ -239,7 +239,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfContainsFF instance = new SfContainsFF();
@@ -253,7 +253,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfContainsFF instance = new SfContainsFF();
@@ -267,7 +267,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfContainsFF instance = new SfContainsFF();
@@ -281,7 +281,7 @@ public class SfContainsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfContainsFF instance = new SfContainsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
index 2cd27ee..d03d32d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
@@ -62,7 +62,7 @@ public class SfCrossesFFTest {
//Point-Linestring returns false. Have to compare with a set of points.
@Test
public void testRelate_multipoint_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_multipoint_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(90 60, 10 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -77,7 +77,7 @@ public class SfCrossesFFTest {
//Point-Polygon returns false. Have to compare with a set of points.
@Test
public void testRelate_multipoint_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_multipoint_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -91,7 +91,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_linestring_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -105,7 +105,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_linestring_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -119,7 +119,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_multipoint_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_multipoint_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(90 60, 80 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -133,7 +133,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_multipoint_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_multipoint_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 65 65)", WKTDatatype.INSTANCE));
@@ -147,7 +147,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_linestring_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
@@ -161,7 +161,7 @@ public class SfCrossesFFTest {
@Test
public void testRelate_linestring_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
@@ -178,7 +178,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -190,7 +190,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -202,7 +202,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfCrossesFF instance = new SfCrossesFF();
@@ -216,7 +216,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfCrossesFF instance = new SfCrossesFF();
@@ -230,7 +230,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfCrossesFF instance = new SfCrossesFF();
@@ -244,7 +244,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfCrossesFF instance = new SfCrossesFF();
@@ -258,7 +258,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfCrossesFF instance = new SfCrossesFF();
@@ -272,7 +272,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfCrossesFF instance = new SfCrossesFF();
@@ -286,7 +286,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfCrossesFF instance = new SfCrossesFF();
@@ -300,7 +300,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfCrossesFF instance = new SfCrossesFF();
@@ -314,7 +314,7 @@ public class SfCrossesFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfCrossesFF instance = new SfCrossesFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
index b70e9cf..9367a1b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
@@ -58,7 +58,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(20 20)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 50, 0 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class SfDisjointFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfDisjointFF instance = new SfDisjointFF();
@@ -183,7 +183,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfDisjointFF instance = new SfDisjointFF();
@@ -197,7 +197,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfDisjointFF instance = new SfDisjointFF();
@@ -211,7 +211,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfDisjointFF instance = new SfDisjointFF();
@@ -225,7 +225,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfDisjointFF instance = new SfDisjointFF();
@@ -239,7 +239,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfDisjointFF instance = new SfDisjointFF();
@@ -253,7 +253,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfDisjointFF instance = new SfDisjointFF();
@@ -267,7 +267,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfDisjointFF instance = new SfDisjointFF();
@@ -281,7 +281,7 @@ public class SfDisjointFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfDisjointFF instance = new SfDisjointFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
index a7c4e22..d8d69c9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
@@ -58,7 +58,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_point_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_linestring_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_point_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(65 65)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_linestring_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(50 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 60 50, 80 50)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -142,7 +142,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -156,7 +156,7 @@ public class SfEqualsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -173,7 +173,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -185,7 +185,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -197,7 +197,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfEqualsFF instance = new SfEqualsFF();
@@ -211,7 +211,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfEqualsFF instance = new SfEqualsFF();
@@ -225,7 +225,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfEqualsFF instance = new SfEqualsFF();
@@ -239,7 +239,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfEqualsFF instance = new SfEqualsFF();
@@ -253,7 +253,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfEqualsFF instance = new SfEqualsFF();
@@ -267,7 +267,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfEqualsFF instance = new SfEqualsFF();
@@ -281,7 +281,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfEqualsFF instance = new SfEqualsFF();
@@ -295,7 +295,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfEqualsFF instance = new SfEqualsFF();
@@ -309,7 +309,7 @@ public class SfEqualsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfEqualsFF instance = new SfEqualsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
index b8b9fb6..a08b306 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
@@ -58,7 +58,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 30, 145 30)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class SfIntersectsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -183,7 +183,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -197,7 +197,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -211,7 +211,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -225,7 +225,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -239,7 +239,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -253,7 +253,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -267,7 +267,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfIntersectsFF instance = new SfIntersectsFF();
@@ -281,7 +281,7 @@ public class SfIntersectsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfIntersectsFF instance = new SfIntersectsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
index b5f42bf..9e2db0d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
@@ -60,7 +60,7 @@ public class SfOverlapsFFTest {
//Point-Point returns false. Have to compare two sets of points.
@Test
public void testRelate_multipoint_multipoint() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_multipoint_multipoint");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 10 10)", WKTDatatype.INSTANCE));
@@ -74,7 +74,7 @@ public class SfOverlapsFFTest {
@Test
public void testRelate_linestring_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 20, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE));
@@ -88,7 +88,7 @@ public class SfOverlapsFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -102,7 +102,7 @@ public class SfOverlapsFFTest {
@Test
public void testRelate_point_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_point_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOINT(60 60, 20 20)", WKTDatatype.INSTANCE));
@@ -116,7 +116,7 @@ public class SfOverlapsFFTest {
@Test
public void testRelate_linestring_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_linestring_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 20, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -130,7 +130,7 @@ public class SfOverlapsFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -147,7 +147,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -159,7 +159,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -171,7 +171,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -185,7 +185,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -199,7 +199,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -213,7 +213,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -227,7 +227,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -241,7 +241,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -255,7 +255,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -269,7 +269,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfOverlapsFF instance = new SfOverlapsFF();
@@ -283,7 +283,7 @@ public class SfOverlapsFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfOverlapsFF instance = new SfOverlapsFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
index edf3be3..37d1e58 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
@@ -59,7 +59,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(90 60)", WKTDatatype.INSTANCE));
@@ -73,7 +73,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 85, 80 30)", WKTDatatype.INSTANCE));
@@ -87,7 +87,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 15, 80 45, 140 45, 140 15, 80 15))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -101,7 +101,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -115,7 +115,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -129,7 +129,7 @@ public class SfTouchesFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -146,7 +146,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -158,7 +158,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -170,7 +170,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfTouchesFF instance = new SfTouchesFF();
@@ -184,7 +184,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfTouchesFF instance = new SfTouchesFF();
@@ -198,7 +198,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfTouchesFF instance = new SfTouchesFF();
@@ -212,7 +212,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfTouchesFF instance = new SfTouchesFF();
@@ -226,7 +226,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfTouchesFF instance = new SfTouchesFF();
@@ -240,7 +240,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfTouchesFF instance = new SfTouchesFF();
@@ -254,7 +254,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfTouchesFF instance = new SfTouchesFF();
@@ -268,7 +268,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfTouchesFF instance = new SfTouchesFF();
@@ -282,7 +282,7 @@ public class SfTouchesFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfTouchesFF instance = new SfTouchesFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
index 3b47abc..6b42654 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
@@ -58,7 +58,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_point() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(60 60)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -72,7 +72,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_linestring() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(40 50, 80 50)", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
@@ -86,7 +86,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((145 30, 145 40, 160 40, 160 30, 145 30))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -100,7 +100,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_point_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_point_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 20)", WKTDatatype.INSTANCE));
@@ -114,7 +114,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_linestring_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_linestring_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(75 60, 145 60)", WKTDatatype.INSTANCE));
@@ -128,7 +128,7 @@ public class SfWithinFFTest {
@Test
public void testRelate_polygon_polygon_false() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("relate_polygon_polygon_false");
+
GeometryWrapper subjectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 40, 30 40))", WKTDatatype.INSTANCE));
GeometryWrapper objectGeometryWrapper = GeometryWrapper.extract(ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15))", WKTDatatype.INSTANCE));
@@ -145,7 +145,7 @@ public class SfWithinFFTest {
*/
@Test
public void testIsDisjoint() {
- System.out.println("isDisjoint");
+
SfWithinFF instance = new SfWithinFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
@@ -157,7 +157,7 @@ public class SfWithinFFTest {
*/
@Test
public void testIsDisconnected() {
- System.out.println("isDisconnected");
+
SfWithinFF instance = new SfWithinFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
@@ -169,7 +169,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_point_point() {
- System.out.println("permittedTopology_point_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfWithinFF instance = new SfWithinFF();
@@ -183,7 +183,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_point_linestring() {
- System.out.println("permittedTopology_point_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfWithinFF instance = new SfWithinFF();
@@ -197,7 +197,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_point_polygon() {
- System.out.println("permittedTopology_point_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POINT;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfWithinFF instance = new SfWithinFF();
@@ -211,7 +211,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_linestring_linestring() {
- System.out.println("permittedTopology_linestring_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfWithinFF instance = new SfWithinFF();
@@ -225,7 +225,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_linestring_point() {
- System.out.println("permittedTopology_linestring_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfWithinFF instance = new SfWithinFF();
@@ -239,7 +239,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_linestring_polygon() {
- System.out.println("permittedTopology_linestring_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_LINESTRING;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfWithinFF instance = new SfWithinFF();
@@ -253,7 +253,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_polygon_polygon() {
- System.out.println("permittedTopology_polygon_polygon");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POLYGON;
SfWithinFF instance = new SfWithinFF();
@@ -267,7 +267,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_polygon_linestring() {
- System.out.println("permittedTopology_polygon_linestring");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_LINESTRING;
SfWithinFF instance = new SfWithinFF();
@@ -281,7 +281,7 @@ public class SfWithinFFTest {
*/
@Test
public void testPermittedTopology_polygon_point() {
- System.out.println("permittedTopology_polygon_point");
+
DimensionInfo sourceDimensionInfo = DimensionInfo.XY_POLYGON;
DimensionInfo targetDimensionInfo = DimensionInfo.XY_POINT;
SfWithinFF instance = new SfWithinFF();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
index 09d3fee..62a0614 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
@@ -61,7 +61,7 @@ public class DimensionInfoTest {
*/
@Test
public void testFind_Coordinate_Geometry() {
- System.out.println("find");
+
Coordinate coordinate = new CoordinateXY(1.0, 2.0);
GeometryFactory factory = new GeometryFactory();
Geometry geometry = factory.createPoint(coordinate);
@@ -75,7 +75,7 @@ public class DimensionInfoTest {
*/
@Test
public void testFind_List_Geometry() {
- System.out.println("find");
+
List<Coordinate> coordinates = Arrays.asList(new CoordinateXY(1.0, 2.0), new CoordinateXY(10.0, 20.0));
GeometryFactory factory = new GeometryFactory();
Geometry geometry = factory.createLineString(coordinates.toArray(new Coordinate[coordinates.size()]));
@@ -89,7 +89,7 @@ public class DimensionInfoTest {
*/
@Test
public void testFindCollection() {
- System.out.println("findCollection");
+
GeometryFactory factory = new GeometryFactory();
List<Point> points = Arrays.asList(factory.createPoint(new Coordinate(1.0, 2.0)), factory.createPoint(new Coordinate(10.0, 20.0)));
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
index 04f802b..ff7e615 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
@@ -67,7 +67,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckPoint() throws FactoryException {
- System.out.println("checkPoint");
+
WKTReader reader = new WKTReader();
try {
@@ -77,8 +77,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("POINT(0 2)");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -93,7 +93,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckLineString() throws FactoryException {
- System.out.println("checkLineString");
+
WKTReader reader = new WKTReader();
try {
@@ -103,8 +103,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("LINESTRING(0 0, 0 2, 0 5)");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -119,7 +119,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckPolygon() throws FactoryException {
- System.out.println("checkPolygon");
+
WKTReader reader = new WKTReader();
try {
@@ -129,8 +129,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("POLYGON ((10 30, 40 40, 40 20, 20 10, 10 30))");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -145,7 +145,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckPolygonHoled() throws FactoryException {
- System.out.println("checkPolygonHoled");
+
WKTReader reader = new WKTReader();
try {
@@ -155,8 +155,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("POLYGON ((10 35, 45 45, 40 15, 20 10, 10 35),(30 20, 35 35, 20 30, 30 20))");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -171,7 +171,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckMultiPoint() throws FactoryException {
- System.out.println("checkMultiPoint");
+
WKTReader reader = new WKTReader();
try {
@@ -181,8 +181,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("MULTIPOINT (40 10, 30 40, 20 20, 10 30)");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -197,7 +197,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckMultiPolygon() throws FactoryException {
- System.out.println("checkMultiPolygon");
+
WKTReader reader = new WKTReader();
try {
@@ -207,8 +207,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("MULTIPOLYGON (((20 30, 40 45, 40 10, 20 30)),((5 15, 10 40, 20 10, 10 5, 5 15)))");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -223,7 +223,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckMultiLineString() throws FactoryException {
- System.out.println("checkMultiLineString");
+
WKTReader reader = new WKTReader();
try {
@@ -233,8 +233,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("MULTILINESTRING ((10 10, 30 20, 40 10),(45 40, 35 30, 20 40, 10 30))");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -247,7 +247,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckLineStringNotReversed() {
- System.out.println("checkLineStringNotReversed");
+
WKTReader reader = new WKTReader();
try {
@@ -256,8 +256,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("LINESTRING(0 0, 2 0, 5 0)");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
@@ -272,7 +272,7 @@ public class GeometryReverseTest {
*/
@Test
public void testCheckMultiPolygonHoled() throws FactoryException {
- System.out.println("checkMultiPolygonHoled");
+
WKTReader reader = new WKTReader();
try {
@@ -282,8 +282,8 @@ public class GeometryReverseTest {
Geometry expResult = reader.read("MULTIPOLYGON (((10 35, 45 45, 40 15, 20 10, 10 35),(30 20, 35 35, 20 30, 30 20)),((5 15, 10 40, 20 10, 10 5, 5 15)))");
Geometry result = GeometryReverse.check(geometry, srsURI);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
} catch (ParseException ex) {
System.err.println("ParseException: " + ex.getMessage());
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
index 04fdcaf..254d712 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
@@ -59,7 +59,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatPoint() {
- System.out.println("createPoint");
+
Coordinate coordinate = new Coordinate(1, 2);
String srsURI = SRS_URI.WGS84_CRS;
String geometryDatatypeURI = WKTDatatype.URI;
@@ -76,7 +76,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatPoint_xy() {
- System.out.println("createPoint_xy");
+
Coordinate coordinate = new Coordinate(1, 2);
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
String geometryDatatypeURI = WKTDatatype.URI;
@@ -93,7 +93,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatLineString() {
- System.out.println("createLineString");
+
List<Coordinate> coordinates = Arrays.asList(new Coordinate(1, 2), new Coordinate(10, 20));
String srsURI = SRS_URI.WGS84_CRS;
String geometryDatatypeURI = WKTDatatype.URI;
@@ -110,7 +110,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatLineString_xy() {
- System.out.println("createLineString_xy");
+
List<Coordinate> coordinates = Arrays.asList(new Coordinate(1, 2), new Coordinate(10, 20));
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
String geometryDatatypeURI = WKTDatatype.URI;
@@ -127,7 +127,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatPolygon() {
- System.out.println("createPolygon");
+
List<Coordinate> coordinates = Arrays.asList(new Coordinate(1, 2), new Coordinate(10, 2), new Coordinate(10, 20), new Coordinate(1, 20), new Coordinate(1, 2));
String srsURI = SRS_URI.WGS84_CRS;
String geometryDatatypeURI = WKTDatatype.URI;
@@ -144,7 +144,7 @@ public class GeometryWrapperFactoryTest {
*/
@Test
public void testCreatPolygon_xy() {
- System.out.println("createPolygon_xy");
+
List<Coordinate> coordinates = Arrays.asList(new Coordinate(1, 2), new Coordinate(10, 2), new Coordinate(10, 20), new Coordinate(1, 20), new Coordinate(1, 2));
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
String geometryDatatypeURI = WKTDatatype.URI;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
index 7f4c853..4d9a4aa 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
@@ -74,7 +74,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testCheckTransformSRS() throws Exception {
- System.out.println("checkTransformSRS");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper sourceSRSGeometry = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -97,7 +97,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetCRS() throws FactoryException {
- System.out.println("getCRS");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -112,7 +112,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetXYGeometry() {
- System.out.println("getXYGeometry");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -131,7 +131,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetXYGeometry_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("getXYGeometry_polygon");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
Coordinate[] coordinates = {new Coordinate(-180.0, 10.0), new Coordinate(-180.0, 20.0), new Coordinate(-170.0, 20.0), new Coordinate(-170.0, 10.0), new Coordinate(-180.0, 10.0)};
@@ -145,7 +145,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetParsingGeometry() {
- System.out.println("getParsingGeometry");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -161,7 +161,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetSrsURI() {
- System.out.println("getSrsURI");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -176,7 +176,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetSRID() {
- System.out.println("getSRID");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -191,7 +191,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testGetGeometryDatatypeURI() {
- System.out.println("getGeometryDatatypeURI");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
String sourceSRSURI = SRS_URI.WGS84_CRS;
GeometryWrapper instance = new GeometryWrapper(geometry, sourceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -208,7 +208,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceSameSRSSameUnit() throws Exception {
- System.out.println("distanceEuclidean, same SRS, same Unit");
+
Geometry targetGeo = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
String targetSRSURI = SRS_URI.OSGB36_CRS;
@@ -233,7 +233,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceSameSRSDifferentUnit() throws Exception {
- System.out.println("distanceEuclidean, same SRS, different Unit");
+
Geometry targetGeo = GEOMETRY_FACTORY.createPoint(new Coordinate(385458, 156785)); //LatLon - 51.31, -2.21
String targetSRSURI = SRS_URI.OSGB36_CRS;
@@ -259,7 +259,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceDifferentSRSSameUnit() throws Exception {
- System.out.println("distanceEuclidean, different SRS, same Unit");
+
Geometry targetGeo = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
String targetSRSURI = SRS_URI.WGS84_CRS;
@@ -285,7 +285,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceDifferentSRSDifferentUnit() throws Exception {
- System.out.println("distanceEuclidean, different SRS, different Unit");
+
Geometry targetGeo = GEOMETRY_FACTORY.createPoint(new Coordinate(0.0, 1.0));
String targetSRSURI = SRS_URI.WGS84_CRS;
@@ -309,7 +309,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testEmptyWKT() {
- System.out.println("emptyWKT");
+
Geometry instanceGeo = GEOMETRY_FACTORY.createPoint();
String instanceSRSURI = SRS_URI.DEFAULT_WKT_CRS84;
GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
@@ -324,7 +324,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testEmptyWKTGeometryWrapper() {
- System.out.println("emptyWKTGeometryWrapper");
+
Geometry instanceGeo = GEOMETRY_FACTORY.createPoint();
String instanceSRSURI = SRS_URI.DEFAULT_WKT_CRS84;
@@ -340,7 +340,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testEmptyGMLGeometryWrapper() {
- System.out.println("emptyGMLGeometryWrapper");
+
Geometry instanceGeo = GEOMETRY_FACTORY.createPoint();
String instanceSRSURI = SRS_URI.DEFAULT_WKT_CRS84;
@@ -356,7 +356,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testAsLiteral() {
- System.out.println("asLiteral");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper instance = WKTDatatype.INSTANCE.parse(lexicalForm);
@@ -372,7 +372,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testAsLiteralConversionURI() {
- System.out.println("asLiteralConversionURI");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper instance = WKTDatatype.INSTANCE.parse(lexicalForm);
@@ -389,7 +389,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testAsLiteralConversionDatatype() {
- System.out.println("asLiteralConversionDatatype");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper instance = WKTDatatype.INSTANCE.parse(lexicalForm);
@@ -408,7 +408,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceGreatCircle() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("distanceGreatCircle");
+
GeometryWrapper instance = SpatialIndexTestData.PARIS_GEOMETRY_WRAPPER;
GeometryWrapper testGeometryWrapper = SpatialIndexTestData.LONDON_GEOMETRY_WRAPPER;
String unitsURI = Unit_URI.KILOMETER_URL;
@@ -426,7 +426,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceGreatCircle_polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("distanceGreatCircle_polygon");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
GeometryWrapper testGeometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 170.0, 20.0 170.0, 20.0 179.0, 10.0 179.0, 10.0 170.0))", WKTDatatype.URI);
String unitsURI = Unit_URI.KILOMETER_URL;
@@ -444,7 +444,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceGreatCircle_polygon2() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("distanceGreatCircle_polygon2");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 0.0, 20.0 0.0, 20.0 10.0, 10.0 10.0, 10.0 0.0))", WKTDatatype.URI);
GeometryWrapper testGeometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -10.0, 20.0 -10.0, 20.0 -1.0, 10.0 -1.0, 10.0 -10.0))", WKTDatatype.URI);
String unitsURI = Unit_URI.KILOMETER_URL;
@@ -460,7 +460,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testTranslateXYGeometry_geographic() {
- System.out.println("translateXYGeometry_geographic");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
//Exp Result is based on the same WGS84 coordinates but shifted by 360 degrees along longitude.
@@ -476,7 +476,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testTranslateXYGeometry_non_geographic() {
- System.out.println("translateXYGeometry_non_geographic");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
//Exp Result is unchanged as only geographic SRS are translated.
@@ -493,7 +493,7 @@ public class GeometryWrapperTest {
*/
@Test
public void testDistanceGreatCircle_overlap() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("distanceGreatCircle_overlap");
+
GeometryWrapper instance = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 0.0, 20.0 0.0, 20.0 10.0, 10.0 10.0, 10.0 0.0))", WKTDatatype.URI);
GeometryWrapper testGeometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 0.0)", WKTDatatype.URI);
String unitsURI = Unit_URI.KILOMETER_URL;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index cbedabb..86e987a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -61,7 +61,7 @@ public class SRSInfoTest {
*/
@Test
public void testBuildDomainEnvelope_WGS84() throws FactoryException {
- System.out.println("buildDomainEnvelope_WGS84");
+
String srsURI = SRS_URI.WGS84_CRS;
CoordinateReferenceSystem crs = CRS.forCode(srsURI);
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
@@ -77,7 +77,7 @@ public class SRSInfoTest {
*/
@Test
public void testBuildDomainEnvelope_CRS84() throws FactoryException {
- System.out.println("buildDomainEnvelope_CRS84");
+
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
CoordinateReferenceSystem crs = CRS.forCode(srsURI);
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
@@ -94,7 +94,7 @@ public class SRSInfoTest {
*/
@Test
public void testBuildDomainEnvelope_OSGB36() throws FactoryException {
- System.out.println("buildDomainEnvelope_OSGB36");
+
String srsURI = SRS_URI.OSGB36_CRS;
CoordinateReferenceSystem crs = CRS.forCode(srsURI);
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
@@ -111,7 +111,7 @@ public class SRSInfoTest {
*/
@Test
public void testCheckAxisXY_WGS84() throws FactoryException {
- System.out.println("checkAxisXY_WGS84");
+
CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.WGS84_CRS);
Boolean expResult = false;
Boolean result = SRSInfo.checkAxisXY(crs);
@@ -125,7 +125,7 @@ public class SRSInfoTest {
*/
@Test
public void testCheckAxisXY_CRS84() throws FactoryException {
- System.out.println("checkAxisXY_CRS84");
+
CoordinateReferenceSystem crs = CRS.forCode("CRS:84");
Boolean expResult = true;
Boolean result = SRSInfo.checkAxisXY(crs);
@@ -139,7 +139,7 @@ public class SRSInfoTest {
*/
@Test
public void testCheckAxisXY_OSGB36() throws FactoryException {
- System.out.println("checkAxisXY_OSGB36");
+
CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.OSGB36_CRS);
Boolean expResult = true;
Boolean result = SRSInfo.checkAxisXY(crs);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
index 8eb3563..ae1b5e5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
@@ -60,7 +60,7 @@ public class UnitsOfMeasureTest {
*/
@Test(expected = UnitsConversionException.class)
public void testConversionRadianToMetre() throws FactoryException {
- System.out.println("conversionRadianToMetre");
+
double distance = 0.5;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/radian";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/27700"); //OSGB - metres projected
@@ -77,7 +77,7 @@ public class UnitsOfMeasureTest {
*/
@Test(expected = UnitsConversionException.class)
public void testConversionMetreToDegree() throws FactoryException {
- System.out.println("conversionMetreToDegree");
+
double distance = 100.0;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/metre";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/4326"); //OSGB - metres projected
@@ -94,7 +94,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConversionMetreToMetre() throws FactoryException {
- System.out.println("conversionMetreToMetre");
+
double distance = 100.0;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/metre";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/27700"); //OSGB - metres projected
@@ -112,7 +112,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConversionDegreeToDegree() throws FactoryException {
- System.out.println("conversionDegreeToDegree");
+
double distance = 100.0;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/degree";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/4326"); //WGS84 degrees non-projected
@@ -130,7 +130,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConversionRadianToDegree() throws FactoryException {
- System.out.println("conversionRadianToDegree");
+
double distance = 0.5;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/radian";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/4326"); //WGS84 degrees non-projected
@@ -149,7 +149,7 @@ public class UnitsOfMeasureTest {
*/
@Test(expected = UnitsConversionException.class)
public void testConversionDegreeToMetre() throws FactoryException {
- System.out.println("conversionDegreeToMetre");
+
double distance = 10.0;
String sourceDistanceUnitURI = "http://www.opengis.net/def/uom/OGC/1.0/degree";
CoordinateReferenceSystem crs = CRS.forCode("http://www.opengis.net/def/crs/EPSG/0/27700"); //OSGB metres projected
@@ -165,7 +165,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_0_degree() {
- System.out.println("convert_0_degree");
+
double distance = 111319.9;
String unitsURI = Unit_URI.METRE_URL;
double latitude = 0.0;
@@ -179,7 +179,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_23_degree() {
- System.out.println("convert_23_degree");
+
double distance = 102470.508;
String unitsURI = Unit_URI.METRE_URL;
double latitude = 23.0;
@@ -193,7 +193,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_45_degree() {
- System.out.println("convert_45_degree");
+
double distance = 78715.05;
String unitsURI = Unit_URI.METRE_URL;
double latitude = 45.0;
@@ -207,7 +207,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_67_degree() {
- System.out.println("convert_67_degree");
+
double distance = 43496.15;
String unitsURI = Unit_URI.METRE_URL;
double latitude = 67.0;
@@ -221,7 +221,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_67_degree2() {
- System.out.println("convert_67_degree2");
+
double distance = 1.0;
String unitsURI = Unit_URI.DEGREE_URL;
double latitude = 67.0;
@@ -235,7 +235,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_0_degree_metres() {
- System.out.println("convert_0_degree_metres");
+
double distance = 1.0;
String unitsURI = Unit_URI.DEGREE_URL;
double latitude = 0.0;
@@ -249,7 +249,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_23_degree_metres() {
- System.out.println("convert_23_degree_metres");
+
double distance = 1.0;
String unitsURI = Unit_URI.DEGREE_URL;
double latitude = 23.0;
@@ -263,7 +263,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_45_degree_metres() {
- System.out.println("convert_45_degree_metres");
+
double distance = 1.0;
String unitsURI = Unit_URI.DEGREE_URL;
double latitude = 45.0;
@@ -277,7 +277,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_67_degree_metres() {
- System.out.println("convert_67_degree_metres");
+
double distance = 1.0;
String unitsURI = Unit_URI.DEGREE_URL;
double latitude = 67.0;
@@ -291,7 +291,7 @@ public class UnitsOfMeasureTest {
*/
@Test
public void testConvert_67_degree2_metres() {
- System.out.println("convert_67_degree2_metres");
+
double distance = 43496.15;
String unitsURI = Unit_URI.METRE_URL;
double latitude = 67.0;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
index 4d64208..2678e91 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
@@ -78,7 +78,7 @@ public class GMLDatatypeTest {
*/
@Test
public void testUnparse() {
- System.out.println("unparse");
+
String expResult = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
@@ -101,7 +101,7 @@ public class GMLDatatypeTest {
*/
@Test
public void testParse() {
- System.out.println("parse");
+
String lexicalForm = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
GMLDatatype instance = GMLDatatype.INSTANCE;
@@ -116,8 +116,8 @@ public class GMLDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSName, GMLDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(expResult, result);
}
@@ -126,7 +126,7 @@ public class GMLDatatypeTest {
*/
@Test
public void testParseNotEqual() {
- System.out.println("parseNotEqual");
+
String lexicalForm = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
GMLDatatype instance = GMLDatatype.INSTANCE;
@@ -142,8 +142,8 @@ public class GMLDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSName, GMLDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -153,7 +153,7 @@ public class GMLDatatypeTest {
@Test
public void testParseNotEqual2() {
- System.out.println("parseNotEqual2");
+
String lexicalForm = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
GMLDatatype instance = GMLDatatype.INSTANCE;
@@ -169,8 +169,8 @@ public class GMLDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSName, GMLDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -180,8 +180,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "-83.4 34.4"));
GeometryWrapper expResult = new GeometryWrapper(test, URL_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -191,8 +191,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "-83.4 34.4"));
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -202,8 +202,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "-83.4 34.0, -83.3 34.3"));
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 1));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -213,8 +213,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 2));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -226,8 +226,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPolygon(shell, holes);
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 2));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -237,8 +237,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createMultiPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "10 40, 40 30, 20 20, 30 10"));
GeometryWrapper expResult = new GeometryWrapper(test, "urn:ogc:def:crs:EPSG::27700", GMLDatatype.URI, new DimensionInfo(2, 2, 0));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -251,8 +251,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createMultiLineString(lineStrings);
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 1));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -267,8 +267,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createMultiPolygon(polygons);
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 2));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -281,8 +281,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createGeometryCollection(geometries);
GeometryWrapper expResult = new GeometryWrapper(test, URN_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 1));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
@@ -296,8 +296,8 @@ public class GMLDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPoint();
GeometryWrapper expResult = new GeometryWrapper(test, SRS_URI.DEFAULT_WKT_CRS84, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
index 80becc5..8128b77 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
@@ -58,7 +58,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testGetGeometryDatatype_RDFDatatype() {
- System.out.println("getGeometryDatatype");
+
RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
GeometryDatatype expResult = WKTDatatype.INSTANCE;
GeometryDatatype result = GeometryDatatype.get(rdfDatatype);
@@ -70,7 +70,7 @@ public class GeometryDatatypeTest {
*/
@Test(expected = DatatypeFormatException.class)
public void testGetGeometryDatatype_RDFDatatype_Fail() {
- System.out.println("getGeometryDatatype_Fail");
+
RDFDatatype rdfDatatype = XSDDatatype.XSDdouble;
GeometryDatatype.get(rdfDatatype);
fail("Exception not thrown when expected.");
@@ -81,7 +81,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testGetGeometryDatatype_String() {
- System.out.println("getGeometryDatatype");
+
String datatypeURI = WKTDatatype.URI;
GeometryDatatype expResult = WKTDatatype.INSTANCE;
GeometryDatatype result = GeometryDatatype.get(datatypeURI);
@@ -93,7 +93,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testCheckGeometryDatatypeURI() {
- System.out.println("checkGeometryDatatypeURI");
+
String datatypeURI = WKTDatatype.URI;
boolean expResult = true;
boolean result = GeometryDatatype.checkURI(datatypeURI);
@@ -105,7 +105,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testCheckGeometryDatatypeURI_Fail() {
- System.out.println("checkGeometryDatatypeURI_Fail");
+
String datatypeURI = XSDDatatype.XSDdouble.getURI();
GeometryDatatype.checkURI(datatypeURI);
boolean expResult = false;
@@ -118,7 +118,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testCheckGeometryDatatype() {
- System.out.println("checkGeometryDatatype");
+
RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
boolean expResult = true;
boolean result = GeometryDatatype.check(rdfDatatype);
@@ -130,7 +130,7 @@ public class GeometryDatatypeTest {
*/
@Test
public void testCheckGeometryDatatype_Fail() {
- System.out.println("checkGeometryDatatype_Fail");
+
RDFDatatype rdfDatatype = XSDDatatype.XSDdouble;
boolean expResult = false;
boolean result = GeometryDatatype.check(rdfDatatype);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
index ffb0514..73f6856 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
@@ -74,7 +74,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testUnparse() {
- System.out.println("unparse");
+
String expResult = "POINT(-83.38 33.95)";
@@ -88,8 +88,8 @@ public class WKTDatatypeTest {
String result = WKT_DATATYPE.unparse(geometry);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -99,7 +99,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testUnparse_srs() {
- System.out.println("unparse");
+
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(-83.38 33.95)";
@@ -113,8 +113,8 @@ public class WKTDatatypeTest {
String result = WKT_DATATYPE.unparse(geometry);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -124,7 +124,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseNoSRS() {
- System.out.println("parseNoSRS");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -137,8 +137,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo, lexicalForm);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -147,7 +147,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseNoSRSNotEqual() {
- System.out.println("parseNoSRSNotEqual");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -161,8 +161,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -171,7 +171,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseNoSRSNotEqual2() {
- System.out.println("parseNoSRSNotEqual2");
+
String lexicalForm = "POINT(-83.38 33.95)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -185,8 +185,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -195,7 +195,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseSRS() {
- System.out.println("parseSRS");
+
String lexicalForm = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(33.95 -88.38)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -209,8 +209,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -219,7 +219,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseSRSNotEqual() {
- System.out.println("parseSRSNotEqual");
+
String lexicalForm = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(33.95 -88.38)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -233,8 +233,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -243,7 +243,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testParseSRSNotEqual2() {
- System.out.println("parseSRSNotEqual2");
+
String lexicalForm = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(33.95 -88.38)";
GeometryWrapper result = WKT_DATATYPE.parse(lexicalForm);
@@ -257,8 +257,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(expGeometry, expSRSURI, WKTDatatype.URI, dimensionInfo);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertThat(expResult, not(result));
}
@@ -267,15 +267,15 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadPoint() {
- System.out.println("readPoint");
+
String wktLiteral = "POINT ZM (11.0 12.0 8.0 5.0)";
Geometry geometry = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "11.0 12.0 8.0 5.0"));
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 0));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -284,15 +284,15 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadPoint2() {
- System.out.println("readPoint2");
+
String wktLiteral = "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ZM(11.0 12.0 8.0 5.0)";
Geometry geometry = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "11.0 12.0 8.0 5.0"));
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 0), wktLiteral);
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -301,15 +301,15 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadLineString() {
- System.out.println("readLineString");
+
String wktLiteral = "LINESTRING ZM (11 12.1 8 5, 3 4 6 2)";
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "11 12.1 8 5, 3 4 6 2"));
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 1));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -318,15 +318,15 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadPolygon() {
- System.out.println("readPolygon");
+
String wktLiteral = "POLYGON ZM((30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1))";
Geometry geometry = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1"));
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 2), wktLiteral);
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -335,7 +335,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadPolygon2() {
- System.out.println("readPolygon2");
+
String wktLiteral = "POLYGON ZM((30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1), (20 30 0 1, 35 35 0 1, 30 20 0 1, 20 30 0 1))";
LinearRing shell = GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1"));
@@ -345,8 +345,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 2));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -355,15 +355,15 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadMultiPoint() {
- System.out.println("readMultiPoint");
+
String wktLiteral = "MULTIPOINT ZM((10 40 0 1), (40 30 0 1), (20 20 0 1), (30 10 0 1))";
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "10 40 0 1, 40 30 0 1, 20 20 0 1, 30 10 0 1"));
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 0));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -372,7 +372,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadMultiLineString() {
- System.out.println("readMultiLineString");
+
String wktLiteral = "MULTILINESTRING ZM((10 10 0 1, 20 20 0 1, 10 40 0 1), (40 40 0 1, 30 30 0 1, 40 20 0 1, 30 10 0 1))";
LineString[] lineStrings = new LineString[2];
@@ -383,8 +383,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 1));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -393,7 +393,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadMultiPolygon() {
- System.out.println("readMultiPolygon");
+
String wktLiteral = "MULTIPOLYGON ZM(((40 40 0 1, 20 45 0 1, 45 30 0 1, 40 40 0 1)), ((20 35 0 1, 10 30 0 1, 10 10 0 1, 30 5 0 1, 45 20 0 1, 20 35 0 1), (30 20 0 1, 20 15 0 1, 20 25 0 1, 30 20 0 1)))";
Polygon[] polygons = new Polygon[2];
@@ -406,8 +406,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 2));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -416,7 +416,7 @@ public class WKTDatatypeTest {
*/
@Test
public void testReadGeometryCollection() {
- System.out.println("readGeometryCollection");
+
String wktLiteral = "GEOMETRYCOLLECTION ZM(POINT ZM (4 6 0 1), LINESTRING ZM (4 6 0 1, 7 10 0 1))";
Geometry[] geometries = new Geometry[2];
@@ -427,8 +427,8 @@ public class WKTDatatypeTest {
GeometryWrapper expResult = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(4, 3, 1));
GeometryWrapper result = WKT_DATATYPE.read(wktLiteral);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -442,8 +442,8 @@ public class WKTDatatypeTest {
Geometry test = GEOMETRY_FACTORY.createPoint();
GeometryWrapper expResult = new GeometryWrapper(test, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 0));
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + geo);
+ //
+ //
assertEquals(geo, expResult);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
index bed4255..a4810a4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
@@ -54,7 +54,7 @@ public class AngleTest {
*/
@Test
public void testFind_upper_right() {
- System.out.println("find_upper_right");
+
double x1 = 25.0;
double y1 = 45.0;
double x2 = 75.0;
@@ -69,7 +69,7 @@ public class AngleTest {
*/
@Test
public void testFind_upper_left() {
- System.out.println("find_upper_left");
+
double x1 = 25.0;
double y1 = 45.0;
double x2 = -25.0;
@@ -84,7 +84,7 @@ public class AngleTest {
*/
@Test
public void testFind_lower_left() {
- System.out.println("find_lower_left");
+
double x1 = 75.0;
double y1 = 100.0;
double x2 = 25.0;
@@ -99,7 +99,7 @@ public class AngleTest {
*/
@Test
public void testFind_lower_right() {
- System.out.println("find_lower_right");
+
double x1 = 75.0;
double y1 = 100.0;
double x2 = 125.0;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
index 35ab83d..67e9552 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
@@ -54,7 +54,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_East() {
- System.out.println("find_East");
+
double lat1 = 0.0;
double lon1 = 0.0;
double lat2 = 0.0;
@@ -69,7 +69,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_North() {
- System.out.println("find_North");
+
double lat1 = 0.0;
double lon1 = 0.0;
double lat2 = 10.0;
@@ -84,7 +84,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_South() {
- System.out.println("find_South");
+
double lat1 = 0.0;
double lon1 = 0.0;
double lat2 = -10.0;
@@ -99,7 +99,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_West() {
- System.out.println("find_West");
+
double lat1 = 0.0;
double lon1 = 0.0;
double lat2 = 0.0;
@@ -114,7 +114,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_East_cross_boundary() {
- System.out.println("find_East_cross_boundary");
+
double lat1 = 0.0;
double lon1 = 170.0;
double lat2 = 0.0;
@@ -129,7 +129,7 @@ public class AzimuthTest {
*/
@Test
public void testFind_West_cross_boundary() {
- System.out.println("find_West_cross_boundary");
+
double lat1 = 0.0;
double lon1 = -170.0;
double lat2 = 0.0;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
index 5059391..868bff6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
@@ -57,7 +57,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_boundary() {
- System.out.println("findNearestPair_boundary");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 170.0, 20.0 170.0, 20.0 179.0, 10.0 179.0, 10.0 170.0))", WKTDatatype.URI);
@@ -71,7 +71,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_boundary2() {
- System.out.println("findNearestPair_boundary2");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 170.0, 20.0 170.0, 20.0 179.0, 10.0 179.0, 10.0 170.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -170.0, 10.0 -170.0, 10.0 -180.0))", WKTDatatype.URI);
@@ -85,7 +85,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_near() {
- System.out.println("findNearestPair_near");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 1.0, 20.0 1.0, 20.0 2.0, 10.0 2.0, 10.0 1.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -2.0, 20.0 -2.0, 20.0 -1.0, 10.0 -1.0, 10.0 -2.0))", WKTDatatype.URI);
@@ -99,7 +99,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_near_postive() {
- System.out.println("findNearestPair_near_positive");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 179.0, 20.0 179.0, 20.0 180.0, 10.0 180.0, 10.0 179.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 177.0, 20.0 177.0, 20.0 178.0, 10.0 178.0, 10.0 177.0))", WKTDatatype.URI);
@@ -113,7 +113,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_near_negative() {
- System.out.println("findNearestPair_near_negative");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -179.0, 10.0 -179.0, 10.0 -180.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -178.0, 20.0 -178.0, 20.0 -177.0, 10.0 -177.0, 10.0 -178.0))", WKTDatatype.URI);
@@ -127,7 +127,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_same_positive_half() {
- System.out.println("findNearestPair_same_positive_half");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 179.0, 20.0 179.0, 20.0 180.0, 10.0 180.0, 10.0 179.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 0.0, 20.0 0.0, 20.0 1.0, 10.0 1.0, 10.0 0.0))", WKTDatatype.URI);
@@ -141,7 +141,7 @@ public class CoordinatePairTest {
*/
@Test
public void testFindNearestPair_same_negative_half() {
- System.out.println("findNearestPair_same_negative_half");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -180.0, 20.0 -180.0, 20.0 -179.0, 10.0 -179.0, 10.0 -180.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 -1.0, 20.0 -1.0, 20.0 0.0, 10.0 0.0, 10.0 -1.0))", WKTDatatype.URI);
@@ -155,7 +155,7 @@ public class CoordinatePairTest {
*/
@Test
public void testIsEqual_overlap() {
- System.out.println("isEqual_overlap");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((5.0 5.0, 15.0 5.0, 15.0 15.0, 5.0 15.0, 5.0 5.0))", WKTDatatype.URI);
@@ -171,7 +171,7 @@ public class CoordinatePairTest {
*/
@Test
public void testIsEqual_no_overlap() {
- System.out.println("isEqual_no_overlap");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((15.0 15.0, 25.0 15.0, 25.0 25.0, 15.0 25.0, 15.0 15.0))", WKTDatatype.URI);
@@ -187,7 +187,7 @@ public class CoordinatePairTest {
*/
@Test
public void testIsEqual_within() {
- System.out.println("isEqual_within");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(5.0 5.0)", WKTDatatype.URI);
@@ -203,7 +203,7 @@ public class CoordinatePairTest {
*/
@Test
public void testIsEqual_no_within() {
- System.out.println("isEqual_no_within");
+
GeometryWrapper sourceGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 0.0, 10.0 0.0, 10.0 10.0, 0.0 10.0, 0.0 0.0))", WKTDatatype.URI);
GeometryWrapper targetGeometry = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(15.0 15.0)", WKTDatatype.URI);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
index fb4084d..e44c20b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
@@ -54,7 +54,7 @@ public class GreatCircleDistanceTest {
*/
@Test
public void testVincentyFormula_London_Paris() {
- System.out.println("vincentyFormula_London_Paris");
+
double lat1 = 51.50853;
double lon1 = -0.12574;
double lat2 = 48.85341;
@@ -69,7 +69,7 @@ public class GreatCircleDistanceTest {
*/
@Test
public void testVincentyFormula_Paris_London() {
- System.out.println("vincentyFormula_Paris_London");
+
double lat2 = 51.50853;
double lon2 = -0.12574;
double lat1 = 48.85341;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
index 4e2aab9..afb82e5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
@@ -57,7 +57,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testLatitude() {
- System.out.println("latitude");
+
double startLat = 48.85341;
double startLon = -2.3488;
double distance = 100000.0;
@@ -73,7 +73,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testLongitude() {
- System.out.println("longitude");
+
double endLatRad = 0.86833;
double startLat = 48.85341;
double startLon = -2.3488;
@@ -90,7 +90,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testRadToPoint_double_double() {
- System.out.println("radToPoint");
+
double latRad = 0.5;
double lonRad = 0.1;
LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(lonRad));
@@ -103,7 +103,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testRadToPoint_3args_false() {
- System.out.println("radToPoint_false");
+
double latRad = 0.5;
double lonRad = Math.PI + 0.1;
boolean isNormaliseLon = false;
@@ -117,7 +117,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testRadToPoint_3args_true() {
- System.out.println("radToPoint_true");
+
double latRad = 0.5;
double lonRad = Math.PI + 0.2;
boolean isNormaliseLon = true;
@@ -131,7 +131,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testNormaliseLongitude() {
- System.out.println("normaliseLongitude");
+
double lonDegrees = 185;
double expResult = -175;
double result = GreatCirclePointDistance.normaliseLongitude(lonDegrees);
@@ -143,7 +143,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testGetPoint_3args_North() {
- System.out.println("getPoint_North");
+
double startLat = 48.85341;
double startLon = -2.3488;
@@ -160,7 +160,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testGetPoint_4args_North() {
- System.out.println("getPoint_North");
+
double startLat = 48.85341;
double startLon = -2.3488;
double distance = 100000.0;
@@ -175,7 +175,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testGetPoint_3args_East() {
- System.out.println("getPoint_East");
+
double startLat = 48.85341;
double startLon = -2.3488;
@@ -192,7 +192,7 @@ public class GreatCirclePointDistanceTest {
*/
@Test
public void testGetPoint_4args_East() {
- System.out.println("getPoint_East");
+
double startLat = 48.85341;
double startLon = -2.3488;
double distance = 100000.0;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
index d38d648..c7577ea 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
@@ -58,7 +58,7 @@ public class CoordinateSequenceDimensionsTest {
*/
@Test
public void testFind_xy() {
- System.out.println("find_xy");
+
Coordinate coordinate = new Coordinate(1.0, 2.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
@@ -70,7 +70,7 @@ public class CoordinateSequenceDimensionsTest {
*/
@Test
public void testFind_xy2() {
- System.out.println("find_xy2");
+
Coordinate coordinate = new CoordinateXY(1.0, 2.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
@@ -82,7 +82,7 @@ public class CoordinateSequenceDimensionsTest {
*/
@Test
public void testFind_xyz() {
- System.out.println("find_xyz");
+
Coordinate coordinate = new Coordinate(1.0, 2.0, 3.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZ;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
@@ -94,7 +94,7 @@ public class CoordinateSequenceDimensionsTest {
*/
@Test
public void testFind_xym() {
- System.out.println("find_xym");
+
Coordinate coordinate = new CoordinateXYM(1.0, 2.0, 3.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYM;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
@@ -106,7 +106,7 @@ public class CoordinateSequenceDimensionsTest {
*/
@Test
public void testFind_xyzm() {
- System.out.println("find_xyzm");
+
Coordinate coordinate = new CoordinateXYZM(1.0, 2.0, 3.0, 4.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZM;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
index 0ab14f6..ca114ff 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
@@ -68,7 +68,7 @@ public class GeometryTransformTest {
*/
@Test
public void testTransformPoint() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("transform_Point");
+
Geometry sourceGeometry = WKTReader.extract("POINT ZM(5 10 8 3)").getGeometry();
CoordinateReferenceSystem sourceCRS = CRS.forCode(SRS_URI.WGS84_CRS);
@@ -78,8 +78,8 @@ public class GeometryTransformTest {
Geometry expResult = WKTReader.extract("POINT ZM(10 5 8 3)").getGeometry();
Geometry result = GeometryTransformation.transform(sourceGeometry, transform);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -91,7 +91,7 @@ public class GeometryTransformTest {
*/
@Test
public void testTransform_Polygon() throws FactoryException, MismatchedDimensionException, TransformException {
- System.out.println("transform_Polygon");
+
Geometry sourceGeometry = WKTReader.extract("POLYGON(5.0 5.0, 5.0 15.0, 15.0 15.0, 15.0 5.0, 5.0 5.0)").getGeometry();
CoordinateReferenceSystem sourceCRS = CRS.forCode(SRS_URI.WGS84_CRS);
@@ -101,8 +101,8 @@ public class GeometryTransformTest {
Geometry expResult = WKTReader.extract("POLYGON(5.0 5.0, 15.0 5.0, 15.0 15.0, 5.0 15.0, 5.0 5.0)").getGeometry();
Geometry result = GeometryTransformation.transform(sourceGeometry, transform);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
index 14405d9..cd679a1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
@@ -74,13 +74,13 @@ public class GMLReaderTest {
*/
@Test
public void testGetDimensionInfo0() {
- System.out.println("getDimensionInfo0");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(), 2);
DimensionInfo expResult = new DimensionInfo(2, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -89,14 +89,14 @@ public class GMLReaderTest {
*/
@Test
public void testGetDimensionInfo2() {
- System.out.println("getDimensionInfo");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXY(11.0, 12.0)), 2);
DimensionInfo expResult = new DimensionInfo(2, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -105,13 +105,13 @@ public class GMLReaderTest {
*/
@Test
public void testGetDimensionInfo3a() {
- System.out.println("getDimensionInfo3a");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new Coordinate(11.0, 12.0, 13.0)), 3);
DimensionInfo expResult = new DimensionInfo(3, 3, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -129,13 +129,13 @@ public class GMLReaderTest {
@Test
@Ignore
public void testGetDimensionInfo3b() {
- System.out.println("getDimensionInfo3b");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXYM(11.0, 12.0, 13.0)), 3);
DimensionInfo expResult = new DimensionInfo(3, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
*/
@@ -144,13 +144,13 @@ public class GMLReaderTest {
*/
@Test
public void testGetDimensionInfo4() {
- System.out.println("getDimensionInfo4");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXYZM(11.0, 12.0, 13.0, 14.0)), 4);
DimensionInfo expResult = new DimensionInfo(4, 3, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -159,13 +159,13 @@ public class GMLReaderTest {
*/
@Test
public void testGetGeometryPoint() {
- System.out.println("getGeometryPoint");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXY(11.0, 12.0)), 2);
Geometry expResult = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.0"));
Geometry result = instance.getGeometry();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -174,13 +174,13 @@ public class GMLReaderTest {
*/
@Test
public void testGetGeometryPointZ() {
- System.out.println("getGeometryPointZ");
+
GMLReader instance = new GMLReader(GEOMETRY_FACTORY.createPoint(new Coordinate(11.0, 12.0, 13.0)), 2);
Geometry expResult = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZ, "11.0 12.0 8.0"));
Geometry result = instance.getGeometry();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -192,13 +192,13 @@ public class GMLReaderTest {
*/
@Test
public void testExtractPoint2() throws JDOMException, IOException {
- System.out.println("extractPoint2");
+
String gmlText = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>11.0 12.0</gml:pos></gml:Point>";
GMLReader expResult = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXY(11.0, 12.0)), 2, SRS_URI.OSGB36_CRS);
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -210,14 +210,14 @@ public class GMLReaderTest {
*/
@Test
public void testExtractPoint3() throws JDOMException, IOException {
- System.out.println("extractPoint3");
+
String gmlText = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>11.0 12.0 8.0</gml:pos></gml:Point>";
GMLReader expResult = new GMLReader(GEOMETRY_FACTORY.createPoint(new Coordinate(11.0, 12.0, 8.0)), 2, SRS_URI.OSGB36_CRS);
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -231,14 +231,14 @@ public class GMLReaderTest {
@Test
@Ignore
public void testExtractPoint3b() throws JDOMException, IOException {
- System.out.println("extractPoint3b");
+
String gmlText = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>11.0 12.0 5.0</gml:pos></gml:Point>";
GMLReader expResult = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXYM(11.0, 12.0, 5.0)), 2, SRS_URI.OSGB36_CRS);
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
*/
@@ -250,14 +250,14 @@ public class GMLReaderTest {
*/
@Test
public void testExtractPoint4() throws JDOMException, IOException {
- System.out.println("extractPoint4");
+
String gmlText = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>11.0 12.0 8.0 5.0</gml:pos></gml:Point>";
GMLReader expResult = new GMLReader(GEOMETRY_FACTORY.createPoint(new CoordinateXYZM(11.0, 12.0, 8.0, 5.0)), 2, SRS_URI.OSGB36_CRS);
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -269,15 +269,15 @@ public class GMLReaderTest {
*/
@Test
public void testExtractPolygon() throws JDOMException, IOException {
- System.out.println("extractPolygon");
+
String gmlText = "<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:LinearRing><gml:posList>30 10 40 40 20 40 10 20 30 10</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon>";
Geometry geometry = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
GMLReader expResult = new GMLReader(geometry, 2, SRS_URI.OSGB36_CRS);
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -289,7 +289,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractPolygonHole() throws JDOMException, IOException {
- System.out.println("extractPolygonHole");
+
LinearRing shell = GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
LinearRing[] holes = new LinearRing[]{GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "20 30, 35 35, 30 20, 20 30"))};
@@ -299,8 +299,8 @@ public class GMLReaderTest {
String gmlText = "<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:LinearRing><gml:posList>30 10 40 40 20 40 10 20 30 10</gml:posList></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:posList>20 30 35 35 30 20 20 30</gml:posList></gml:LinearRing></gml:interior></gml:Polygon>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -312,7 +312,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractLineString() throws JDOMException, IOException {
- System.out.println("extractLineString");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1, 15.0 8.0"));
GMLReader expResult = new GMLReader(geometry, 2, SRS_URI.OSGB36_CRS);
@@ -320,8 +320,8 @@ public class GMLReaderTest {
String gmlText = "<gml:LineString xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:posList>11 12.1 15 8</gml:posList></gml:LineString>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -333,7 +333,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractLineStringSegment() throws JDOMException, IOException {
- System.out.println("extractLineStringSegment");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1, 15.0 8.0, 20.0 14.0, 25.0 14.0"));
GMLReader expResult = new GMLReader(geometry, 2, SRS_URI.OSGB36_CRS);
@@ -341,8 +341,8 @@ public class GMLReaderTest {
String gmlText = "<gml:Curve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:segments><gml:LineStringSegment><gml:posList>11 12.1 15 8</gml:posList></gml:LineStringSegment><gml:LineStringSegment><gml:posList>15.0 8.0 20.0 14.0 25.0 14.0</gml:posList></gml:LineStringSegment></gml:segments></gml:Curve>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -354,7 +354,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractArc() throws JDOMException, IOException {
- System.out.println("extractArc");
+
GeometricShapeFactory shapeFactory = new GeometricShapeFactory(GEOMETRY_FACTORY);
shapeFactory.setCentre(new CoordinateXY(0, 0));
@@ -365,8 +365,8 @@ public class GMLReaderTest {
String gmlText = "<gml:Curve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:segments><gml:Arc><gml:posList>5 0 0 5 -5 0</gml:posList></gml:Arc></gml:segments></gml:Curve>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -378,7 +378,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractCircle() throws JDOMException, IOException {
- System.out.println("extractCircle");
+
GeometricShapeFactory shapeFactory = new GeometricShapeFactory(GEOMETRY_FACTORY);
shapeFactory.setCentre(new CoordinateXY(0, 0));
@@ -389,8 +389,8 @@ public class GMLReaderTest {
String gmlText = "<gml:Curve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:segments><gml:Circle><gml:posList>5 0 0 5 -5 0</gml:posList></gml:Circle></gml:segments></gml:Curve>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -402,7 +402,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractCircleByCentrePoint() throws JDOMException, IOException {
- System.out.println("extractCircleByCentrePoint");
+
GeometricShapeFactory shapeFactory = new GeometricShapeFactory(GEOMETRY_FACTORY);
shapeFactory.setCentre(new Coordinate(0, 0));
@@ -412,8 +412,8 @@ public class GMLReaderTest {
String gmlText = "<gml:Curve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:segments><gml:CircleByCenterPoint ><gml:pos>0 0</gml:pos><gml:radius uom=\"http://www.opengis.net/def/uom/OGC/1.0/metre\">5.0</gml:radius></gml:CircleByCenterPoint></gml:segments></gml:Curve>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -425,7 +425,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractMultiPoint() throws JDOMException, IOException {
- System.out.println("extractMultiPoint");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "10 40, 40 30, 20 20, 30 10"));
GMLReader expResult = new GMLReader(geometry, 2, SRS_URI.OSGB36_CRS);
@@ -433,8 +433,8 @@ public class GMLReaderTest {
String gmlText = "<gml:MultiPoint xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pointMember><gml:Point srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>10 40</gml:pos></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>40 30</gml:pos></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName=\"http://www.opengis.net/def/crs/EPSG [...]
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -446,7 +446,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractMutliCurve() throws JDOMException, IOException {
- System.out.println("extractMultiCurve");
+
LineString[] lineStrings = new LineString[2];
lineStrings[0] = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "10 10, 20 20, 10 40"));
@@ -457,8 +457,8 @@ public class GMLReaderTest {
String gmlText = "<gml:MultiCurve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:curveMember><gml:LineString srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:posList>10 10 20 20 10 40</gml:posList></gml:LineString></gml:curveMember><gml:curveMember><gml:LineString srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:posList>40 40 30 30 40 20 30 10</gml:posList></gml:LineString></gml:curveMember></gml:M [...]
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -470,7 +470,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractMultiSurface() throws JDOMException, IOException {
- System.out.println("extractMultiSurface");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 20 45, 45 30, 40 40"));
@@ -481,8 +481,8 @@ public class GMLReaderTest {
String gmlText = "<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:surfaceMember><gml:Polygon srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:LinearRing><gml:posList>40 40 20 45 45 30 40 40</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember><gml:surfaceMember><gml:Polygon srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:Linear [...]
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -494,7 +494,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractMultiSurface2() throws JDOMException, IOException {
- System.out.println("extractMultiSurface2");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 20 45, 45 30, 40 40"));
@@ -507,8 +507,8 @@ public class GMLReaderTest {
String gmlText = "<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:surfaceMember><gml:Polygon srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:LinearRing><gml:posList>40 40 20 45 45 30 40 40</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></gml:surfaceMember><gml:surfaceMember><gml:Polygon srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:exterior><gml:Linear [...]
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -520,7 +520,7 @@ public class GMLReaderTest {
*/
@Test
public void testExtractMultiGeometry() throws JDOMException, IOException {
- System.out.println("extractMultiGeometry");
+
Geometry[] geometries = new Geometry[2];
geometries[0] = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "4 6"));
@@ -531,8 +531,8 @@ public class GMLReaderTest {
String gmlText = "<gml:MultiGeometry xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:geometryMember><gml:Point srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:pos>4 6</gml:pos></gml:Point></gml:geometryMember><gml:geometryMember><gml:LineString srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"><gml:posList>4 6 7 10</gml:posList></gml:LineString></gml:geometryMember></gml:MultiGeometry>";
GMLReader result = GMLReader.extract(gmlText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -544,14 +544,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildPointEmpty() throws JDOMException, IOException {
- System.out.println("buildPointEmpty");
+
GMLReader instance = GMLReader.extract("<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:Point>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createPoint();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -563,14 +563,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildLineStringEmpty() throws JDOMException, IOException {
- System.out.println("buildLineStringEmpty");
+
GMLReader instance = GMLReader.extract("<gml:LineString xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:LineString>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createLineString();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -582,14 +582,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildCurveEmpty() throws JDOMException, IOException {
- System.out.println("buildCurveEmpty");
+
GMLReader instance = GMLReader.extract("<gml:Curve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:Curve>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createLineString();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -601,14 +601,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildPolygonEmpty() throws JDOMException, IOException {
- System.out.println("buildPolygonEmpty");
+
GMLReader instance = GMLReader.extract("<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:Polygon>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createPolygon();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -620,14 +620,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildMultiPointEmpty() throws JDOMException, IOException {
- System.out.println("buildMultiPointEmpty");
+
GMLReader instance = GMLReader.extract("<gml:MultiPoint xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:MultiPoint>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiPoint();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -639,14 +639,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildMultiCurveEmpty() throws JDOMException, IOException {
- System.out.println("buildMultiCurveEmpty");
+
GMLReader instance = GMLReader.extract("<gml:MultiCurve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:MultiCurve>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiLineString();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -658,14 +658,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildMultiSurfaceEmpty() throws JDOMException, IOException {
- System.out.println("buildMultiSurfaceEmpty");
+
GMLReader instance = GMLReader.extract("<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:MultiSurface>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiPolygon();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -677,14 +677,14 @@ public class GMLReaderTest {
*/
@Test
public void testBuildMultiGeometryEmpty() throws JDOMException, IOException {
- System.out.println("buildMultiGeometryEmpty");
+
GMLReader instance = GMLReader.extract("<gml:MultiGeometry xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/27700\"></gml:MultiGeometry>");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createGeometryCollection();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -697,15 +697,15 @@ public class GMLReaderTest {
*/
@Test
public void testBuildEmpty() throws JDOMException, IOException {
- System.out.println("buildEmpty");
+
GMLReader instance = GMLReader.extract("");
Geometry result = instance.getGeometry();
CustomCoordinateSequence pointSequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "");
Geometry expResult = GEOMETRY_FACTORY.createPoint(pointSequence);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -714,13 +714,13 @@ public class GMLReaderTest {
*/
@Test
public void testFindCentre() {
- System.out.println("findCentre");
+
List<Coordinate> coordinates = Arrays.asList(new Coordinate(-3, 4), new Coordinate(4, 5), new Coordinate(1, -4));
Coordinate expResult = new Coordinate(1, 1);
Coordinate result = GMLReader.findCentre(coordinates);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -729,14 +729,14 @@ public class GMLReaderTest {
*/
@Test
public void testFindAngle() {
- System.out.println("findAngle");
+
Coordinate coord0 = new Coordinate(0, 0);
Coordinate coord1 = new Coordinate(5, 5);
double expResult = Math.PI / 4; //45 degrees from x-axis.
double result = GMLReader.findAngle(coord0, coord1);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result, 0.0);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
index 9db1b5f..6a398dd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
@@ -67,51 +67,51 @@ public class GMLWriterTest {
@Test
public void testWritePoint() {
- System.out.println("writePoint");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, GML_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pos>11 12.1</gml:pos></gml:Point>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteLineString() {
- System.out.println("writeLineString");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1, 15.0 8.0"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, GML_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:LineString xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:posList>11 12.1 15 8</gml:posList></gml:LineString>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWritePolygon() {
- System.out.println("writePolygon");
+
Geometry geometry = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, GML_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>30 10 40 40 20 40 10 20 30 10</gml:posList></gml:exterior></gml:Polygon>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWritePolygon2() {
- System.out.println("writePolygon2");
+
LinearRing shell = GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
LinearRing[] holes = new LinearRing[]{GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "20 30, 35 35, 30 20, 20 30"))};
Geometry geometry = GEOMETRY_FACTORY.createPolygon(shell, holes);
@@ -120,28 +120,28 @@ public class GMLWriterTest {
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>30 10 40 40 20 40 10 20 30 10</gml:posList></gml:exterior><gml:interior><gml:posList>20 30 35 35 30 20 20 30</gml:posList></gml:interior></gml:Polygon>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteMultiPoint() {
- System.out.println("writeMultiPoint");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "10 40, 40 30, 20 20, 30 10"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, GML_SRS_NAMESPACE, GMLDatatype.URI, new DimensionInfo(2, 2, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiPoint xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pointMember><gml:Point srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pos>10 40</gml:pos></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pos>40 30</gml:pos></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pos>20 20</gml:pos></gml:Point></gml:pointMemb [...]
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteMultiCurve() {
- System.out.println("writeMultiCurve");
+
LineString[] lineStrings = new LineString[2];
lineStrings[0] = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "10 10, 20 20, 10 40"));
lineStrings[1] = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 30 30, 40 20, 30 10"));
@@ -151,14 +151,14 @@ public class GMLWriterTest {
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiCurve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:curveMember><gml:LineString srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:posList>10 10 20 20 10 40</gml:posList></gml:LineString></gml:curveMember><gml:curveMember><gml:LineString srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:posList>40 40 30 30 40 20 30 10</gml:posList></gml:LineString></gml:curveMember></gml:MultiCurve>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteMultiSurface() {
- System.out.println("writeMultiSurface");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 20 45, 45 30, 40 40"));
polygons[1] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "20 35, 10 30, 10 10, 30 5, 45 20, 20 35"));
@@ -168,14 +168,14 @@ public class GMLWriterTest {
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:surfaceMember><gml:Polygon srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>40 40 20 45 45 30 40 40</gml:posList></gml:exterior></gml:Polygon></gml:surfaceMember><gml:surfaceMember><gml:Polygon srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>20 35 10 30 10 10 30 5 45 20 20 35</gml:posList></gml:exterior></gml:Polygon> [...]
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteMultiSurface2() {
- System.out.println("writeMultiSurface2");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 20 45, 45 30, 40 40"));
LinearRing shell = GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "20 35, 10 30, 10 10, 30 5, 45 20, 20 35"));
@@ -187,14 +187,14 @@ public class GMLWriterTest {
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:surfaceMember><gml:Polygon srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>40 40 20 45 45 30 40 40</gml:posList></gml:exterior></gml:Polygon></gml:surfaceMember><gml:surfaceMember><gml:Polygon srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:exterior><gml:posList>20 35 10 30 10 10 30 5 45 20 20 35</gml:posList></gml:exterior><gml:interior> [...]
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@Test
public void testWriteMultiGeometry() {
- System.out.println("writeMultiGeometry");
+
Geometry[] geometries = new Geometry[2];
geometries[0] = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "4 6"));
geometries[1] = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "4 6,7 10"));
@@ -204,8 +204,8 @@ public class GMLWriterTest {
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiGeometry xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:geometryMember><gml:Point srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:pos>4 6</gml:pos></gml:Point></gml:geometryMember><gml:geometryMember><gml:LineString srsName=\"urn:ogc:def:crs:EPSG::27700\"><gml:posList>4 6 7 10</gml:posList></gml:LineString></gml:geometryMember></gml:MultiGeometry>";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult.trim(), result.trim());
}
@@ -214,15 +214,15 @@ public class GMLWriterTest {
*/
@Test
public void testWritePointEmpty() {
- System.out.println("writePointEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -231,14 +231,14 @@ public class GMLWriterTest {
*/
@Test
public void testWriteLineStringEmpty() {
- System.out.println("writeLineEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:LineString xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -247,14 +247,14 @@ public class GMLWriterTest {
*/
@Test
public void testWritePolygonEmpty() {
- System.out.println("writePolygonEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createPolygon();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:Polygon xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -263,14 +263,14 @@ public class GMLWriterTest {
*/
@Test
public void testWriteMultiPointEmpty() {
- System.out.println("writeMultiPointEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiPoint xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -279,15 +279,15 @@ public class GMLWriterTest {
*/
@Test
public void testWriteMultiCurveEmpty() {
- System.out.println("writeMultiCurveEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiLineString();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiCurve xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -296,15 +296,15 @@ public class GMLWriterTest {
*/
@Test
public void testWriteMultiSurfaceEmpty() {
- System.out.println("writeMultiSurfaceEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPolygon();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiSurface xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -313,15 +313,15 @@ public class GMLWriterTest {
*/
@Test
public void testWriteMultiGeometryEmpty() {
- System.out.println("writeMultiGeometryEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createGeometryCollection();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, GMLDatatype.URI, new DimensionInfo(4, 3, 0));
String result = GMLWriter.write(geometryWrapper);
String expResult = "<gml:MultiGeometry xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/EPSG/0/4326\" />";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
index 17a5e27..dbff736 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
@@ -65,13 +65,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetDimensionInfo0() {
- System.out.println("getDimensionInfo0");
+
WKTReader instance = new WKTReader("point", "", "");
DimensionInfo expResult = new DimensionInfo(2, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -80,13 +80,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetDimensionInfo2() {
- System.out.println("getDimensionInfo");
+
WKTReader instance = new WKTReader("point", "", "(11.0 12.0)");
DimensionInfo expResult = new DimensionInfo(2, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -95,13 +95,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetDimensionInfo3a() {
- System.out.println("getDimensionInfo3a");
+
WKTReader instance = new WKTReader("point", "z", "(11.0 12.0 7.0)");
DimensionInfo expResult = new DimensionInfo(3, 3, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -110,13 +110,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetDimensionInfo3b() {
- System.out.println("getDimensionInfo3b");
+
WKTReader instance = new WKTReader("point", "m", "(11.0 12.0 7.0)");
DimensionInfo expResult = new DimensionInfo(3, 2, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -125,13 +125,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetDimensionInfo4() {
- System.out.println("getDimensionInfo4");
+
WKTReader instance = new WKTReader("point", "zm", "(11.0 12.0 7.0 5.0)");
DimensionInfo expResult = new DimensionInfo(4, 3, 0);
DimensionInfo result = instance.getDimensionInfo();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -140,13 +140,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetGeometryPoint() {
- System.out.println("getGeometryPoint");
+
WKTReader instance = new WKTReader("point", "", "(11.0 12.0)");
Geometry expResult = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.0"));
Geometry result = instance.getGeometry();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -155,13 +155,13 @@ public class WKTReaderTest {
*/
@Test
public void testGetGeometryPointZ() {
- System.out.println("getGeometryPointZ");
+
WKTReader instance = new WKTReader("point", "z", "(11.0 12.0 8.0)");
Geometry expResult = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZ, "11.0 12.0 8.0"));
Geometry result = instance.getGeometry();
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -170,13 +170,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPoint2() {
- System.out.println("extractPoint2");
+
String wktText = "POINT (11.0 12.0)";
WKTReader expResult = new WKTReader("point", "", "(11.0 12.0)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -185,13 +185,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPoint3() {
- System.out.println("extractPoint3");
+
String wktText = "POINT Z (11.0 12.0 8.0)";
WKTReader expResult = new WKTReader("point", "z", "(11.0 12.0 8.0)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -200,13 +200,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPoint3b() {
- System.out.println("extractPoint3b");
+
String wktText = "POINT M (11.0 12.0 5.0)";
WKTReader expResult = new WKTReader("point", "m", "(11.0 12.0 5.0)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -215,13 +215,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPoint4() {
- System.out.println("extractPoint4");
+
String wktText = "POINT ZM (11.0 12.0 8.0 5.0)";
WKTReader expResult = new WKTReader("point", "zm", "(11.0 12.0 8.0 5.0)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -230,13 +230,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPolygon() {
- System.out.println("extractPolygon");
+
String wktText = "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))";
WKTReader expResult = new WKTReader("polygon", "", "(30 10, 40 40, 20 40, 10 20, 30 10)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -245,13 +245,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractPolygonHole() {
- System.out.println("extractPolygonHole");
+
String wktText = "POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))";
WKTReader expResult = new WKTReader("polygon", "", "(35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -260,13 +260,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractLineString() {
- System.out.println("extractLineString");
+
String wktText = "LINESTRING (30 10, 10 30, 40 40)";
WKTReader expResult = new WKTReader("linestring", "", "(30 10, 10 30, 40 40)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -275,13 +275,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractMultiPoint() {
- System.out.println("extractMultiPoint");
+
String wktText = "MULTIPOINT ((10 40), (40 30), (20 20), (30 10))";
WKTReader expResult = new WKTReader("multipoint", "", "((10 40), (40 30), (20 20), (30 10))");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -290,13 +290,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractMultiPoint2() {
- System.out.println("extractMultiPoint2");
+
String wktText = "MULTIPOINT (10 40, 40 30, 20 20, 30 10)";
WKTReader expResult = new WKTReader("multipoint", "", "(10 40, 40 30, 20 20, 30 10)");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -305,13 +305,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractMutliLineString() {
- System.out.println("extractMultiLineString");
+
String wktText = "MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))";
WKTReader expResult = new WKTReader("multilinestring", "", "((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -320,13 +320,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractMultiPolygon() {
- System.out.println("extractMultiPolygon");
+
String wktText = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))";
WKTReader expResult = new WKTReader("multipolygon", "", "(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -335,13 +335,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractMultiPolygon2() {
- System.out.println("extractMultiPolygon2");
+
String wktText = "MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)),((20 35, 10 30, 10 10, 30 5, 45 20, 20 35),(30 20, 20 15, 20 25, 30 20)))";
WKTReader expResult = new WKTReader("multipolygon", "", "(((40 40, 20 45, 45 30, 40 40)),((20 35, 10 30, 10 10, 30 5, 45 20, 20 35),(30 20, 20 15, 20 25, 30 20)))");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -350,13 +350,13 @@ public class WKTReaderTest {
*/
@Test
public void testExtractGeometryCollection() {
- System.out.println("extractGeometryCollection");
+
String wktText = "GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10), MULTIPOINT((6 8),(2 3)))";
WKTReader expResult = new WKTReader("geometrycollection", "", "(POINT(4 6),LINESTRING(4 6,7 10), MULTIPOINT((6 8),(2 3)))");
WKTReader result = WKTReader.extract(wktText);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -365,15 +365,15 @@ public class WKTReaderTest {
*/
@Test
public void testBuildPointEmpty() {
- System.out.println("buildPointEmpty");
+
WKTReader instance = WKTReader.extract("POINT EMPTY");
Geometry result = instance.getGeometry();
CustomCoordinateSequence pointSequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "");
Geometry expResult = GEOMETRY_FACTORY.createPoint(pointSequence);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -382,15 +382,15 @@ public class WKTReaderTest {
*/
@Test
public void testBuildLineStringEmpty() {
- System.out.println("buildLineStringEmpty");
+
WKTReader instance = WKTReader.extract("LINESTRING EMPTY");
Geometry result = instance.getGeometry();
CustomCoordinateSequence pointSequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "");
Geometry expResult = GEOMETRY_FACTORY.createLineString(pointSequence);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -399,15 +399,15 @@ public class WKTReaderTest {
*/
@Test
public void testBuildPolygonEmpty() {
- System.out.println("buildPolygonEmpty");
+
WKTReader instance = WKTReader.extract("POLYGON EMPTY");
Geometry result = instance.getGeometry();
CustomCoordinateSequence pointSequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "");
Geometry expResult = GEOMETRY_FACTORY.createPolygon(pointSequence);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -416,14 +416,14 @@ public class WKTReaderTest {
*/
@Test
public void testBuildMultiPointEmpty() {
- System.out.println("buildMultiPointEmpty");
+
WKTReader instance = WKTReader.extract("MULTIPOINT EMPTY");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiPoint(new Point[0]);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -432,14 +432,14 @@ public class WKTReaderTest {
*/
@Test
public void testBuildMultiLineStringEmpty() {
- System.out.println("buildMultiLineStringEmpty");
+
WKTReader instance = WKTReader.extract("MULTILINESTRING EMPTY");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiLineString(new LineString[0]);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -448,14 +448,14 @@ public class WKTReaderTest {
*/
@Test
public void testBuildMultiPolygonEmpty() {
- System.out.println("buildMultiPolygonEmpty");
+
WKTReader instance = WKTReader.extract("MULTIPOLYGON EMPTY");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createMultiPolygon(new Polygon[0]);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -464,14 +464,14 @@ public class WKTReaderTest {
*/
@Test
public void testBuildGeometryCollectionEmpty() {
- System.out.println("buildGeometryCollectionEmpty");
+
WKTReader instance = WKTReader.extract("GEOMETRYCOLLECTION EMPTY");
Geometry result = instance.getGeometry();
Geometry expResult = GEOMETRY_FACTORY.createGeometryCollection(new Geometry[0]);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -482,15 +482,15 @@ public class WKTReaderTest {
*/
@Test
public void testBuildEmpty() {
- System.out.println("buildEmpty");
+
WKTReader instance = WKTReader.extract("");
Geometry result = instance.getGeometry();
CustomCoordinateSequence pointSequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "");
Geometry expResult = GEOMETRY_FACTORY.createPoint(pointSequence);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
index 624f9cf..a5cc646 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
@@ -68,7 +68,7 @@ public class WKTWriterTest {
*/
@Test
public void testWritePoint() {
- System.out.println("writePoint");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(2, 2, 0));
@@ -76,8 +76,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> POINT(11 12.1)";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -86,7 +86,7 @@ public class WKTWriterTest {
*/
@Test
public void testWritePoint2() {
- System.out.println("writePoint2");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "11.0 12.1 8.0 5.0"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(4, 3, 0));
@@ -94,8 +94,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> POINT ZM(11 12.1 8 5)";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -104,7 +104,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteLineString() {
- System.out.println("writeLineString");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "11.0 12.1, 3 4"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(2, 2, 1));
@@ -112,8 +112,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> LINESTRING(11 12.1, 3 4)";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -122,7 +122,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteLineString2() {
- System.out.println("writeLineString2");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "11.0 12.1 8.0 5.0, 3 4 6 2"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(4, 3, 1));
@@ -130,8 +130,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> LINESTRING ZM(11 12.1 8 5, 3 4 6 2)";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -140,7 +140,7 @@ public class WKTWriterTest {
*/
@Test
public void testWritePolygon() {
- System.out.println("writePolygon");
+
Geometry geometry = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "30 10, 40 40, 20 40, 10 20, 30 10"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(2, 2, 2));
@@ -148,8 +148,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -158,7 +158,7 @@ public class WKTWriterTest {
*/
@Test
public void testWritePolygon2() {
- System.out.println("writePolygon2");
+
Geometry geometry = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(4, 3, 2));
@@ -166,8 +166,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> POLYGON ZM((30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -176,7 +176,7 @@ public class WKTWriterTest {
*/
@Test
public void testWritePolygon3() {
- System.out.println("writePolygon3");
+
LinearRing shell = GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1"));
LinearRing[] holes = new LinearRing[]{GEOMETRY_FACTORY.createLinearRing(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "20 30 0 1, 35 35 0 1, 30 20 0 1, 20 30 0 1"))};
Geometry geometry = GEOMETRY_FACTORY.createPolygon(shell, holes);
@@ -186,8 +186,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> POLYGON ZM((30 10 0 1, 40 40 0 1, 20 40 0 1, 10 20 0 1, 30 10 0 1), (20 30 0 1, 35 35 0 1, 30 20 0 1, 20 30 0 1))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -196,7 +196,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiPoint() {
- System.out.println("writeMultiPoint");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "10 40 0 1, 40 30 0 1, 20 20 0 1, 30 10 0 1"));
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.WGS84_CRS, WKTDatatype.URI, new DimensionInfo(4, 3, 0));
@@ -204,8 +204,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> MULTIPOINT ZM((10 40 0 1), (40 30 0 1), (20 20 0 1), (30 10 0 1))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -214,7 +214,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiLineString() {
- System.out.println("writeMultiLineString");
+
LineString[] lineStrings = new LineString[2];
lineStrings[0] = GEOMETRY_FACTORY.createLineString(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "10 10 0 1, 20 20 0 1, 10 40 0 1"));
@@ -226,8 +226,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> MULTILINESTRING ZM((10 10 0 1, 20 20 0 1, 10 40 0 1), (40 40 0 1, 30 30 0 1, 40 20 0 1, 30 10 0 1))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -236,7 +236,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiPolygon() {
- System.out.println("writeMultiPolygon");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XY, "40 40, 20 45, 45 30, 40 40"));
@@ -248,8 +248,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> MULTIPOLYGON(((40 40, 20 45, 45 30, 40 40)), ((20 35, 10 30, 10 10, 30 5, 45 20, 20 35)))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -258,7 +258,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiPolygon2() {
- System.out.println("writeMultiPolygon2");
+
Polygon[] polygons = new Polygon[2];
polygons[0] = GEOMETRY_FACTORY.createPolygon(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "40 40 0 1, 20 45 0 1, 45 30 0 1, 40 40 0 1"));
@@ -272,8 +272,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> MULTIPOLYGON ZM(((40 40 0 1, 20 45 0 1, 45 30 0 1, 40 40 0 1)), ((20 35 0 1, 10 30 0 1, 10 10 0 1, 30 5 0 1, 45 20 0 1, 20 35 0 1), (30 20 0 1, 20 15 0 1, 20 25 0 1, 30 20 0 1)))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -282,7 +282,7 @@ public class WKTWriterTest {
*/
@Test
public void testWriteGeometryCollection() {
- System.out.println("writeGeometryCollection");
+
Geometry[] geometries = new Geometry[2];
geometries[0] = GEOMETRY_FACTORY.createPoint(new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "4 6 0 1"));
@@ -294,8 +294,8 @@ public class WKTWriterTest {
String expResult = "<" + SRS_URI.WGS84_CRS + "> GEOMETRYCOLLECTION ZM(POINT ZM(4 6 0 1), LINESTRING ZM(4 6 0 1, 7 10 0 1))";
String result = WKTWriter.write(geometryWrapper);
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -304,15 +304,15 @@ public class WKTWriterTest {
*/
@Test
public void testWritePointEmpty() {
- System.out.println("writePointEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createPoint();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 0));
String result = WKTWriter.write(geometryWrapper);
String expResult = "POINT EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -321,14 +321,14 @@ public class WKTWriterTest {
*/
@Test
public void testWriteLineStringEmpty() {
- System.out.println("writeLineEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createLineString();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 1));
String result = WKTWriter.write(geometryWrapper);
String expResult = "LINESTRING EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -337,14 +337,14 @@ public class WKTWriterTest {
*/
@Test
public void testWritePolygonEmpty() {
- System.out.println("writePolygonEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createPolygon();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 2));
String result = WKTWriter.write(geometryWrapper);
String expResult = "POLYGON EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -353,14 +353,14 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiPointEmpty() {
- System.out.println("writeMultiPointEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPoint();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 0));
String result = WKTWriter.write(geometryWrapper);
String expResult = "MULTIPOINT EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -369,15 +369,15 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiLineStringEmpty() {
- System.out.println("writeMultiLineStringEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiLineString();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 1));
String result = WKTWriter.write(geometryWrapper);
String expResult = "MULTILINESTRING EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -386,15 +386,15 @@ public class WKTWriterTest {
*/
@Test
public void testWriteMultiPolygonEmpty() {
- System.out.println("writeMultiPolygonEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createMultiPolygon();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 2));
String result = WKTWriter.write(geometryWrapper);
String expResult = "MULTIPOLYGON EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
@@ -403,15 +403,15 @@ public class WKTWriterTest {
*/
@Test
public void testWriteGeometryCollectionEmpty() {
- System.out.println("writeGeometryCollectionEmpty");
+
Geometry geometry = GEOMETRY_FACTORY.createGeometryCollection();
GeometryWrapper geometryWrapper = new GeometryWrapper(geometry, SRS_URI.DEFAULT_WKT_CRS84, WKTDatatype.URI, new DimensionInfo(2, 2, 2));
String result = WKTWriter.write(geometryWrapper);
String expResult = "GEOMETRYCOLLECTION EMPTY";
- //System.out.println("Expected: " + expResult);
- //System.out.println("Result: " + result);
+ //
+ //
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
index dd6973d..7159c61 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
@@ -61,7 +61,7 @@ public class SRSRegistryTest {
*/
@Test
public void testGetCRS() throws FactoryException {
- System.out.println("getCRS");
+
String srsURI = "http://www.opengis.net/def/crs/EPSG/0/4326";
CoordinateReferenceSystem expResult = CRS.forCode(srsURI);
CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
@@ -74,7 +74,7 @@ public class SRSRegistryTest {
@Test
public void testGetDefaultWKTCRS() {
try {
- System.out.println("getDefaultWKTCRS");
+
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
String default_CRS_WKT = "GeodeticCRS[\"WGS 84\",\n"
@@ -93,7 +93,7 @@ public class SRSRegistryTest {
CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
assertEquals(expResult.toWKT(), result.toWKT());
} catch (FactoryException ex) {
- System.out.println("Default WKT CRS error: " + ex.getMessage());
+
}
}
@@ -103,7 +103,7 @@ public class SRSRegistryTest {
*/
@Test
public void testGetAxisXY_WGS84URI() {
- System.out.println("getAxisXY_WGS84URI");
+
String srsURI = SRS_URI.WGS84_CRS;
Boolean expResult = false;
Boolean result = SRSRegistry.getAxisXY(srsURI);
@@ -116,7 +116,7 @@ public class SRSRegistryTest {
*/
@Test
public void testGetAxisXY_CRS84URI() {
- System.out.println("getAxisXY_CRS84URI");
+
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
Boolean expResult = true;
Boolean result = SRSRegistry.getAxisXY(srsURI);
@@ -129,7 +129,7 @@ public class SRSRegistryTest {
*/
@Test
public void testGetAxisXY_OSGB36URI() {
- System.out.println("getAxisXY_OSGB36URI");
+
String srsURI = SRS_URI.OSGB36_CRS;
Boolean expResult = true;
Boolean result = SRSRegistry.getAxisXY(srsURI);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
index 450d1c6..39a2541 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
@@ -60,7 +60,7 @@ public class ConvertLatLonBoxTest {
*/
@Test
public void testToWKT() {
- System.out.println("toWKT");
+
float latMin = 0.0F;
float lonMin = 1.0F;
float latMax = 10.0F;
@@ -75,7 +75,7 @@ public class ConvertLatLonBoxTest {
*/
@Test
public void testToLiteral() {
- System.out.println("toLiteral");
+
float latMin = 0.0F;
float lonMin = 1.0F;
float latMax = 10.0F;
@@ -90,7 +90,7 @@ public class ConvertLatLonBoxTest {
*/
@Test
public void testConvert_4args_1() {
- System.out.println("convert");
+
NodeValue v1 = NodeValue.makeFloat(0.0f);
NodeValue v2 = NodeValue.makeFloat(1.0f);
NodeValue v3 = NodeValue.makeFloat(10.0f);
@@ -105,7 +105,7 @@ public class ConvertLatLonBoxTest {
*/
@Test
public void testConvert_4args_2() {
- System.out.println("convert");
+
Node n1 = NodeValue.makeFloat(0.0f).asNode();
Node n2 = NodeValue.makeFloat(1.0f).asNode();
Node n3 = NodeValue.makeFloat(10.0f).asNode();
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
index 03c31b2..29f4430 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
@@ -61,7 +61,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testConvert_NodeValue_NodeValue() {
- System.out.println("convert");
+
NodeValue v1 = NodeValue.makeFloat(10.0f);
NodeValue v2 = NodeValue.makeFloat(20.0f);
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
@@ -74,7 +74,7 @@ public class ConvertLatLonTest {
*/
@Test(expected = DatatypeFormatException.class)
public void testCheckBounds_lat_too_big() {
- System.out.println("checkBounds_lat_too_big");
+
double latitude = 90.1;
double longitude = 0.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -85,7 +85,7 @@ public class ConvertLatLonTest {
*/
@Test(expected = DatatypeFormatException.class)
public void testCheckBounds_lat_too_small() {
- System.out.println("checkBounds_lat_too_small");
+
double latitude = -90.1;
double longitude = 0.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -96,7 +96,7 @@ public class ConvertLatLonTest {
*/
@Test(expected = DatatypeFormatException.class)
public void testCheckBounds_lon_too_big() {
- System.out.println("checkBounds_lon_too_big");
+
double latitude = 0.0;
double longitude = 180.1;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -107,7 +107,7 @@ public class ConvertLatLonTest {
*/
@Test(expected = DatatypeFormatException.class)
public void testCheckBounds_lon_too_small() {
- System.out.println("checkBounds_lon_too_small");
+
double latitude = 0.0;
double longitude = -180.1;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -118,7 +118,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testCheckBounds_lat_big() {
- System.out.println("checkBounds_lat_big");
+
double latitude = 90.0;
double longitude = 0.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -129,7 +129,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testCheckBounds_lat_small() {
- System.out.println("checkBounds_lat_small");
+
double latitude = -90.0;
double longitude = 0.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -140,7 +140,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testCheckBounds_lon_big() {
- System.out.println("checkBounds_lon_big");
+
double latitude = 0.0;
double longitude = 180.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -151,7 +151,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testCheckBounds_lon_small() {
- System.out.println("checkBounds_lon_small");
+
double latitude = 0.0;
double longitude = -180.0;
ConvertLatLon.checkBounds(latitude, longitude);
@@ -162,7 +162,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testToWKT() {
- System.out.println("toWKT");
+
float lat = 10.0F;
float lon = 20.0F;
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)";
@@ -175,7 +175,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testToLiteral() {
- System.out.println("toLiteral");
+
float lat = 10.0F;
float lon = 20.0F;
Literal expResult = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
@@ -188,7 +188,7 @@ public class ConvertLatLonTest {
*/
@Test
public void testConvert_Node_Node() {
- System.out.println("convert");
+
Node n1 = NodeValue.makeFloat(10.0f).asNode();
Node n2 = NodeValue.makeFloat(20.0f).asNode();
Node expResult = NodeFactory.createLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index 1505132..c002f93 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -71,7 +71,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_NORTH() {
- System.out.println("build_NORTH");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.NORTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, 10, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -84,7 +84,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_SOUTH() {
- System.out.println("build_SOUTH");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.SOUTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, Y1, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -97,7 +97,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_EAST() {
- System.out.println("build_EAST");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 -20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-20, 160, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -110,7 +110,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_WEST() {
- System.out.println("build_WEST");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-160, 20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -123,7 +123,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuildWrap_EAST() {
- System.out.println("buildWrap_EAST");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 100.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(100, 280, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -136,7 +136,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuildWrap_WEST() {
- System.out.println("buildWrap_WEST");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 -20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-200, -20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -149,7 +149,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_NORTH_OSGB() {
- System.out.println("build_NORTH_OSGB");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.NORTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, 20, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
@@ -162,7 +162,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_SOUTH_OSGB() {
- System.out.println("build_SOUTH_OSGB");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.SOUTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, OS_Y1, 20), SpatialIndexTestData.OSGB_SRS_INFO);
@@ -175,7 +175,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_EAST_OSGB() {
- System.out.println("build_EAST_OSGB");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(10, OS_X2, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
@@ -188,7 +188,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_WEST_OSGB() {
- System.out.println("build_WEST_OSGB");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10.0 20.0)", WKTDatatype.URI);
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, 10, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
@@ -201,7 +201,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetMainEnvelope() {
- System.out.println("getMainEnvelope");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(0, 10, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(0, 10, 0, 10);
Envelope result = instance.getMainEnvelope();
@@ -213,7 +213,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetMainEnvelope2() {
- System.out.println("getMainEnvelope2");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(40, 220, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(40, 180, 0, 10);
Envelope result = instance.getMainEnvelope();
@@ -225,7 +225,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetMainEnvelope3() {
- System.out.println("getMainEnvelope3");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(-180, -40, 0, 10);
Envelope result = instance.getMainEnvelope();
@@ -237,7 +237,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetMainEnvelope_OSGB() {
- System.out.println("getMainEnvelope_OSGB");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
Envelope expResult = new Envelope(-220, -40, 0, 10);
Envelope result = instance.getMainEnvelope();
@@ -249,7 +249,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetWrapEnvelope() {
- System.out.println("getWrapEnvelope");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(0, 10, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = null;
@@ -262,7 +262,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetWrapEnvelope2() {
- System.out.println("getWrapEnvelope2");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(40, 220, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(-180, -140, 0, 10);
@@ -275,7 +275,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetWrapEnvelope3() {
- System.out.println("getWrapEnvelope3");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(140, 180, 0, 10);
@@ -288,7 +288,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testGetWrapEnvelope_OSGB() {
- System.out.println("getWrapEnvelope_OSGB");
+
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
Envelope expResult = null;
Envelope result = instance.getWrapEnvelope();
@@ -300,7 +300,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_3args() {
- System.out.println("build");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(0 0)", WKTDatatype.URI);
double radius = 10;
String unitsURI = Unit_URI.KILOMETER_URL;
@@ -314,7 +314,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_3args_OSGB() {
- System.out.println("build_OSGB");
+
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(0 0)", WKTDatatype.URI);
double radius = 10;
String unitsURI = Unit_URI.KILOMETER_URL;
@@ -328,7 +328,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testBuild_GeometryWrapper() {
- System.out.println("build");
+
GeometryWrapper geometryWrapper = SpatialIndexTestData.PARIS_GEOMETRY_WRAPPER;
SearchEnvelope expResult = new SearchEnvelope(geometryWrapper.getEnvelope(), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
@@ -340,7 +340,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testCheck() {
- System.out.println("check");
+
SpatialIndex spatialIndex = SpatialIndexTestData.createTestIndex();
//Search Envelope
@@ -360,7 +360,7 @@ public class SearchEnvelopeTest {
*/
@Test
public void testCheck_empty() {
- System.out.println("check_empty");
+
SpatialIndex spatialIndex = SpatialIndexTestData.createTestIndex();
//Search Envelope
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
index 606e007..b0648e3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
@@ -77,7 +77,7 @@ public class SpatialIndexTestData {
spatialIndex.build();
TEST_SPATIAL_INDEX = spatialIndex;
} catch (SpatialIndexException ex) {
- System.out.println("Spatial Index Error: " + ex.getMessage());
+
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
index 66de222..4641eaa 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
@@ -69,7 +69,7 @@ public class AngleDegreesFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec");
+
NodeValue v1 = NodeValue.makeDouble(25);
NodeValue v2 = NodeValue.makeDouble(45);
NodeValue v3 = NodeValue.makeDouble(75);
@@ -85,7 +85,7 @@ public class AngleDegreesFFTest {
*/
@Test
public void testExec_query() {
- System.out.println("exec_query");
+
Dataset dataset = SpatialIndexTestData.createTestDataset();
@@ -108,8 +108,8 @@ public class AngleDegreesFFTest {
List<Literal> expResults = Arrays.asList(ResourceFactory.createTypedLiteral("42.27368900609373e0", XSDDatatype.XSDdouble));
- //System.out.println("Exp: " + expResults);
- //System.out.println("Res: " + results);
+ //
+ //
assertEquals(expResults, results);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
index 945af0f..2e55c58 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
@@ -69,7 +69,7 @@ public class AngleFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec");
+
NodeValue v1 = NodeValue.makeDouble(25);
NodeValue v2 = NodeValue.makeDouble(45);
NodeValue v3 = NodeValue.makeDouble(75);
@@ -85,7 +85,7 @@ public class AngleFFTest {
*/
@Test
public void testExec_query() {
- System.out.println("exec_query");
+
Dataset dataset = SpatialIndexTestData.createTestDataset();
@@ -108,8 +108,8 @@ public class AngleFFTest {
List<Literal> expResults = Arrays.asList(ResourceFactory.createTypedLiteral("0.7378150601204649e0", XSDDatatype.XSDdouble));
- //System.out.println("Exp: " + expResults);
- //System.out.println("Res: " + results);
+ //
+ //
assertEquals(expResults, results);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
index 0a6b3a6..dfcd422 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
@@ -69,7 +69,7 @@ public class AzimuthDegreesFFTest {
*/
@Test
public void testExec() {
- System.out.println("exec");
+
NodeValue v1 = NodeValue.makeDouble(0);
NodeValue v2 = NodeValue.makeDouble(0);
NodeValue v3 = NodeValue.makeDouble(0);
@@ -85,7 +85,7 @@ public class AzimuthDegreesFFTest {
*/
@Test
public void testExec_query() {
- System.out.println("exec_query");
+
Dataset dataset = SpatialIndexTestData.createTestDataset();
@@ -108,8 +108,8 @@ public class AzimuthDegreesFFTest {
List<Literal> expResults = Arrays.asList(ResourceFactory.createTypedLiteral("90.0e0", XSDDatatype.XSDdouble));
- //System.out.println("Exp: " + expResults);
- //System.out.println("Res: " + results);
+ //
... 1914 lines suppressed ...
[jena] 03/08: - removed commented out System.out messages in Test
packages.
Posted by an...@apache.org.
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 619693364f7c03c5aa0b61dbe59abac8f52a7ea7
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:33:27 2019 +0100
- removed commented out System.out messages in Test packages.
---
.../configuration/GeoSPARQLOperationsTest.java | 42 -------------
.../jena/geosparql/configuration/ModeSRSTest.java | 6 --
.../GenericGeometryPropertyFunctionTest.java | 12 ----
.../topological/GenericPropertyFunctionTest.java | 57 -----------------
.../SpatialObjectGeometryLiteralTest.java | 18 ------
.../egenhofer/EhContainsPFTest.java | 18 ------
.../egenhofer/EhCoveredByPFTest.java | 18 ------
.../egenhofer/EhCoversPFTest.java | 12 ----
.../egenhofer/EhDisjointPFTest.java | 18 ------
.../egenhofer/EhEqualsPFTest.java | 30 ---------
.../egenhofer/EhInsidePFTest.java | 24 --------
.../property_functions/egenhofer/EhMeetPFTest.java | 18 ------
.../egenhofer/EhOverlapPFTest.java | 15 -----
.../CoordinateDimensionPFTest.java | 12 ----
.../geometry_property/DimensionPFTest.java | 9 ---
.../geometry_property/IsEmptyPFTest.java | 6 --
.../geometry_property/IsSimplePFTest.java | 6 --
.../geometry_property/IsValidPFTest.java | 6 --
.../geometry_property/SpatialDimensionPFTest.java | 12 ----
.../rcc8/RccDisconnectedPFTest.java | 6 --
.../property_functions/rcc8/RccEqualsPFTest.java | 12 ----
.../rcc8/RccExternallyConnectedPFTest.java | 6 --
.../RccNonTangentialProperPartInversePFTest.java | 6 --
.../rcc8/RccNonTangentialProperPartPFTest.java | 6 --
.../rcc8/RccPartiallyOverlappingPFTest.java | 6 --
.../rcc8/RccTangentialProperPartInversePFTest.java | 6 --
.../rcc8/RccTangentialProperPartPFTest.java | 6 --
.../simple_features/SfContainsPFTest.java | 18 ------
.../simple_features/SfCrossesPFTest.java | 24 --------
.../simple_features/SfDisjointPFTest.java | 18 ------
.../simple_features/SfEqualsPFTest.java | 30 ---------
.../simple_features/SfIntersectsPFTest.java | 18 ------
.../simple_features/SfOverlapsPFTest.java | 18 ------
.../simple_features/SfTouchesPFTest.java | 18 ------
.../simple_features/SfWithinPFTest.java | 18 ------
.../filter_functions/BoundaryFFTest.java | 6 --
.../filter_functions/BufferFFTest.java | 12 ----
.../filter_functions/ConvexHullFFTest.java | 6 --
.../filter_functions/DifferenceFFTest.java | 3 -
.../filter_functions/DistanceFFTest.java | 6 --
.../filter_functions/EnvelopFFTest.java | 9 ---
.../filter_functions/GetSRIDFFTest.java | 6 --
.../filter_functions/IntersectionFFTest.java | 9 ---
.../SymmetricDifferenceFFTest.java | 3 -
.../filter_functions/UnionFFTest.java | 3 -
.../egenhofer/EhContainsFFTest.java | 51 ---------------
.../egenhofer/EhCoveredByFFTest.java | 51 ---------------
.../filter_functions/egenhofer/EhCoversFFTest.java | 45 --------------
.../egenhofer/EhDisjointFFTest.java | 51 ---------------
.../filter_functions/egenhofer/EhEqualsFFTest.java | 57 -----------------
.../filter_functions/egenhofer/EhInsideFFTest.java | 57 -----------------
.../filter_functions/egenhofer/EhMeetFFTest.java | 51 ---------------
.../egenhofer/EhOverlapFFTest.java | 48 ---------------
.../CoordinateDimensionFFTest.java | 12 ----
.../geometry_property/DimensionFFTest.java | 9 ---
.../geometry_property/IsEmptyFFTest.java | 6 --
.../geometry_property/IsSimpleFFTest.java | 6 --
.../geometry_property/IsValidFFTest.java | 6 --
.../geometry_property/SpatialDimensionFFTest.java | 12 ----
.../rcc8/RccDisconnectedFFTest.java | 39 ------------
.../filter_functions/rcc8/RccEqualsFFTest.java | 39 ------------
.../rcc8/RccExternallyConnectedFFTest.java | 39 ------------
.../rcc8/RccNonTangentialProperPartFFTest.java | 39 ------------
.../RccNonTangentialProperPartInverseFFTest.java | 39 ------------
.../rcc8/RccPartiallyOverlappingFFTest.java | 39 ------------
.../rcc8/RccTangentialProperPartFFTest.java | 39 ------------
.../rcc8/RccTangentialProperPartInverseFFTest.java | 39 ------------
.../simple_features/SfContainsFFTest.java | 51 ---------------
.../simple_features/SfCrossesFFTest.java | 57 -----------------
.../simple_features/SfDisjointFFTest.java | 51 ---------------
.../simple_features/SfEqualsFFTest.java | 57 -----------------
.../simple_features/SfIntersectsFFTest.java | 51 ---------------
.../simple_features/SfOverlapsFFTest.java | 51 ---------------
.../simple_features/SfTouchesFFTest.java | 51 ---------------
.../simple_features/SfWithinFFTest.java | 51 ---------------
.../implementation/DimensionInfoTest.java | 9 ---
.../implementation/GeometryWrapperFactoryTest.java | 18 ------
.../implementation/GeometryWrapperTest.java | 72 ----------------------
.../jena/geosparql/implementation/SRSInfoTest.java | 18 ------
.../implementation/UnitsOfMeasureTest.java | 39 ------------
.../implementation/datatype/GMLDatatypeTest.java | 3 -
.../datatype/GeometryDatatypeTest.java | 18 ------
.../implementation/great_circle/AngleTest.java | 12 ----
.../implementation/great_circle/AzimuthTest.java | 18 ------
.../great_circle/CoordinatePairTest.java | 33 ----------
.../great_circle/GreatCircleDistanceTest.java | 6 --
.../great_circle/GreatCirclePointDistanceTest.java | 30 ---------
.../jts/CoordinateSequenceDimensionsTest.java | 15 -----
.../implementation/registry/SRSRegistryTest.java | 15 -----
.../geosparql/spatial/ConvertLatLonBoxTest.java | 12 ----
.../jena/geosparql/spatial/ConvertLatLonTest.java | 12 ----
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 69 ---------------------
.../filter_functions/AngleDegreesFFTest.java | 3 -
.../spatial/filter_functions/AngleFFTest.java | 3 -
.../filter_functions/AzimuthDegreesFFTest.java | 3 -
.../spatial/filter_functions/AzimuthFFTest.java | 3 -
.../filter_functions/ConvertLatLonBoxFFTest.java | 15 -----
.../filter_functions/ConvertLatLonFFTest.java | 9 ---
.../spatial/filter_functions/DistanceFFTest.java | 21 -------
.../spatial/filter_functions/EqualsFFTest.java | 57 -----------------
.../filter_functions/GreatCircleFFTest.java | 24 --------
.../filter_functions/GreatCircleGeomFFTest.java | 18 ------
.../spatial/filter_functions/NearbyFFTest.java | 39 ------------
.../spatial/property_functions/EqualsPFTest.java | 30 ---------
.../GenericSpatialGeomPropertyFunctionTest.java | 18 ------
.../GenericSpatialPropertyFunctionTest.java | 15 -----
.../box/GenericSpatialBoxPropertyFunctionTest.java | 27 --------
.../box/IntersectBoxGeomPFTest.java | 9 ---
.../property_functions/box/IntersectBoxPFTest.java | 9 ---
.../box/WithinBoxGeomPFTest.java | 9 ---
.../property_functions/box/WithinBoxPFTest.java | 9 ---
.../cardinal/EastGeomPFTest.java | 12 ----
.../property_functions/cardinal/EastPFTest.java | 12 ----
.../GenericCardinalGeomPropertyFunctionTest.java | 6 --
.../GenericCardinalPropertyFunctionTest.java | 21 -------
.../cardinal/NorthGeomPFTest.java | 6 --
.../property_functions/cardinal/NorthPFTest.java | 6 --
.../cardinal/SouthGeomPFTest.java | 6 --
.../property_functions/cardinal/SouthPFTest.java | 6 --
.../cardinal/WestGeomPFTest.java | 12 ----
.../property_functions/cardinal/WestPFTest.java | 12 ----
.../nearby/NearbyGeomPFTest.java | 39 ------------
.../property_functions/nearby/NearbyPFTest.java | 36 -----------
123 files changed, 2706 deletions(-)
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
index 465326e..68eeee7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
@@ -124,9 +124,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
Model instance = GeoSPARQLOperations.convert(inputModel);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -141,9 +138,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
Model instance = GeoSPARQLOperations.convert(inputModel, outputSrsURI);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -158,9 +152,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATA);
Model instance = GeoSPARQLOperations.convert(inputModel, outputDatatype);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -176,9 +167,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATATYPE_DATA);
Model instance = GeoSPARQLOperations.convert(inputModel, outputSrsURI, outputDatatype);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -192,9 +180,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
Dataset instance = GeoSPARQLOperations.convert(dataset);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -209,9 +194,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
Dataset instance = GeoSPARQLOperations.convert(dataset, outputSrsURI);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -226,9 +208,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATASET);
Dataset instance = GeoSPARQLOperations.convert(dataset, outputDatatype);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -244,9 +223,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATATYPE_DATASET);
Dataset instance = GeoSPARQLOperations.convert(inputDataset, outputSrsURI, outputDatatype);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -261,9 +237,6 @@ public class GeoSPARQLOperationsTest {
GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
List<String> expResult = Arrays.asList("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(1 0)", "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(3 2)");
List<String> result = GeoSPARQLOperations.convertGeometryLiterals(geometryLiterals, outputSrsURI, outputDatatype);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -278,9 +251,6 @@ public class GeoSPARQLOperationsTest {
GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(1 0)";
String result = GeoSPARQLOperations.convertGeometryLiteral(geometryLiteral, outputSrsURI, outputDatatype);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -295,9 +265,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
Dataset instance = GeoSPARQLOperations.convertGeoPredicates(dataset, isRemoveGeoPredicate);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -312,9 +279,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
Model instance = GeoSPARQLOperations.convertGeoPredicates(model, isRemoveGeoPredicates);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -329,9 +293,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(GEO_ALL_DATASET);
Dataset instance = GeoSPARQLOperations.convertGeoPredicates(dataset, isRemoveGeoPredicate);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -346,9 +307,6 @@ public class GeoSPARQLOperationsTest {
TreeSet<String> expResult = extract(GEO_ALL_DATA);
Model instance = GeoSPARQLOperations.convertGeoPredicates(model, isRemoveGeoPredicates);
TreeSet<String> result = extract(instance);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
index 7cebbe3..a986cfe 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
@@ -85,9 +85,6 @@ public class ModeSRSTest {
expResult.add(new SimpleEntry<>("http://www.opengis.net/def/crs/EPSG/0/27700", 1));
List<Entry<String, Integer>> result = instance.getSrsList();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +98,6 @@ public class ModeSRSTest {
instance.search(MODEL);
String expResult = "http://www.opengis.net/def/crs/OGC/1.3/CRS84";
String result = instance.getModeURI();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
index 531462b..47a9ac2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
@@ -83,9 +83,6 @@ public class GenericGeometryPropertyFunctionTest {
GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
Node expResult = NodeFactory.createLiteral("2", XSDDatatype.XSDinteger);
Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +100,6 @@ public class GenericGeometryPropertyFunctionTest {
GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
Node expResult = null;
Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -123,9 +117,6 @@ public class GenericGeometryPropertyFunctionTest {
GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
Node expResult = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger);
Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -143,9 +134,6 @@ public class GenericGeometryPropertyFunctionTest {
GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
Node expResult = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger);
Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
index 950f22b..e312047 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
@@ -103,9 +103,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -123,9 +120,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -143,9 +137,6 @@ public class GenericPropertyFunctionTest {
Node node = NodeFactory.createBlankNode(id);
Boolean result = graph.contains(node, RDF.type.asNode(), Geo.GEOMETRY_NODE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,8 +157,6 @@ public class GenericPropertyFunctionTest {
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -185,9 +174,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -205,9 +191,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -225,9 +208,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -248,8 +228,6 @@ public class GenericPropertyFunctionTest {
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +245,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = false;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -287,9 +262,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = false;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -307,9 +279,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = false;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -327,9 +296,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = false;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -348,9 +314,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -371,8 +334,6 @@ public class GenericPropertyFunctionTest {
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -390,9 +351,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = true;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -410,9 +368,6 @@ public class GenericPropertyFunctionTest {
QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
Boolean expResult = false;
Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -447,9 +402,6 @@ public class GenericPropertyFunctionTest {
//Blank nodes limit a value check.
boolean expResult = true;
boolean result = subjects.size() == 25 && objects.size() == 25;
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//System.out.println("Subjects: " + subjects);
//System.out.println("Objects: " + objects);
assertEquals(expResult, result);
@@ -484,9 +436,6 @@ public class GenericPropertyFunctionTest {
//Blank nodes limit a value check.
int expResult = 6;
int result = objects.size();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//System.out.println("Objects: " + objects);
assertEquals(expResult, result);
}
@@ -594,9 +543,6 @@ public class GenericPropertyFunctionTest {
List<Resource> expSubjects = Arrays.asList(FEATURE_A);
List<Resource> expObjects = Arrays.asList(FEATURE_B);
boolean result = subjects.equals(expSubjects) && objects.equals(expObjects);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -634,9 +580,6 @@ public class GenericPropertyFunctionTest {
List<Resource> expSubjects = Arrays.asList(GEO_FEATURE_Y);
List<Resource> expObjects = Arrays.asList(GEO_FEATURE_Z);
boolean result = subjects.equals(expSubjects) && objects.equals(expObjects);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
index 821cdaa..9ff149e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
@@ -75,9 +75,6 @@ public class SpatialObjectGeometryLiteralTest {
boolean expResult = false;
boolean result = instance.isValid();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -92,9 +89,6 @@ public class SpatialObjectGeometryLiteralTest {
Resource targetSpatialObject = GEOMETRY_B;
SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(GEOMETRY_B.asNode(), LITERAL_B.asNode());
SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(graph, targetSpatialObject.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -108,9 +102,6 @@ public class SpatialObjectGeometryLiteralTest {
Resource targetSpatialObject = FEATURE_B;
SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(FEATURE_B.asNode(), LITERAL_B.asNode());
SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(MODEL.getGraph(), targetSpatialObject.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -127,9 +118,6 @@ public class SpatialObjectGeometryLiteralTest {
boolean expResult = false;
boolean result = instance.isValid();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -146,9 +134,6 @@ public class SpatialObjectGeometryLiteralTest {
boolean expResult = false;
boolean result = instance.isValid();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -162,9 +147,6 @@ public class SpatialObjectGeometryLiteralTest {
Resource targetSpatialObject = GEO_FEATURE_Y;
SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(GEO_FEATURE_Y.asNode(), GEO_FEATURE_LITERAL.asNode());
SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(MODEL.getGraph(), targetSpatialObject.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
index b9896b2..f76cb37 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
@@ -63,9 +63,6 @@ public class EhContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class EhContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class EhContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class EhContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class EhContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class EhContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
index d51a2c2..4f19c51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
@@ -65,9 +65,6 @@ public class EhCoveredByPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class EhCoveredByPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class EhCoveredByPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +107,6 @@ public class EhCoveredByPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class EhCoveredByPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class EhCoveredByPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
index 92b44a3..7a6036e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
@@ -65,9 +65,6 @@ public class EhCoversPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class EhCoversPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class EhCoversPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +107,6 @@ public class EhCoversPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
index 51265b5..b59e95e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
@@ -63,9 +63,6 @@ public class EhDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class EhDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class EhDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class EhDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class EhDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class EhDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
index 0c3fba2..36c2a11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
@@ -64,9 +64,6 @@ public class EhEqualsPFTest {
Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class EhEqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -98,9 +92,6 @@ public class EhEqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -203,9 +179,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -223,9 +196,6 @@ public class EhEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
index e9ec8b8..ca97a40 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
@@ -65,9 +65,6 @@ public class EhInsidePFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class EhInsidePFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class EhInsidePFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +107,6 @@ public class EhInsidePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class EhInsidePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class EhInsidePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class EhInsidePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class EhInsidePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
index 22a6edb..bbfc469 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
@@ -65,9 +65,6 @@ public class EhMeetPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class EhMeetPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class EhMeetPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +107,6 @@ public class EhMeetPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class EhMeetPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class EhMeetPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
index f521ea1..74aa2d6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
@@ -68,9 +68,6 @@ public class EhOverlapPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class EhOverlapPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -102,9 +96,6 @@ public class EhOverlapPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -119,9 +110,6 @@ public class EhOverlapPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -136,9 +124,6 @@ public class EhOverlapPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
index 860df27..a2ed96d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
@@ -62,9 +62,6 @@ public class CoordinateDimensionPFTest {
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class CoordinateDimensionPFTest {
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -94,9 +88,6 @@ public class CoordinateDimensionPFTest {
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -110,9 +101,6 @@ public class CoordinateDimensionPFTest {
CoordinateDimensionPF instance = new CoordinateDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(4);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
index 24fbbba..0b15ae2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
@@ -62,9 +62,6 @@ public class DimensionPFTest {
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(0);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class DimensionPFTest {
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(1);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -94,9 +88,6 @@ public class DimensionPFTest {
DimensionPF instance = new DimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
index d5f24e8..efd91ff 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
@@ -62,9 +62,6 @@ public class IsEmptyPFTest {
IsEmptyPF instance = new IsEmptyPF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class IsEmptyPFTest {
IsEmptyPF instance = new IsEmptyPF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
index 74f2dd7..611627c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
@@ -62,9 +62,6 @@ public class IsSimplePFTest {
IsSimplePF instance = new IsSimplePF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class IsSimplePFTest {
IsSimplePF instance = new IsSimplePF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
index a4395d4..6305902 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
@@ -62,9 +62,6 @@ public class IsValidPFTest {
IsValidPF instance = new IsValidPF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class IsValidPFTest {
IsValidPF instance = new IsValidPF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
index f4e3a19..06a40e4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
@@ -62,9 +62,6 @@ public class SpatialDimensionPFTest {
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class SpatialDimensionPFTest {
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -94,9 +88,6 @@ public class SpatialDimensionPFTest {
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -110,9 +101,6 @@ public class SpatialDimensionPFTest {
SpatialDimensionPF instance = new SpatialDimensionPF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.applyPredicate(geometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
index 4d1d390..356baa5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
@@ -64,9 +64,6 @@ public class RccDisconnectedPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class RccDisconnectedPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
index 72318d0..a58a2b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
@@ -65,9 +65,6 @@ public class RccEqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class RccEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -102,9 +96,6 @@ public class RccEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -122,9 +113,6 @@ public class RccEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
index 9759c26..1d36830 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
@@ -63,9 +63,6 @@ public class RccExternallyConnectedPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class RccExternallyConnectedPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
index e7dda11..2b47c77 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
@@ -63,9 +63,6 @@ public class RccNonTangentialProperPartInversePFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class RccNonTangentialProperPartInversePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
index 1be6f78..272cb11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
@@ -63,9 +63,6 @@ public class RccNonTangentialProperPartPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class RccNonTangentialProperPartPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
index 07cc3b9..d4928d8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
@@ -63,9 +63,6 @@ public class RccPartiallyOverlappingPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class RccPartiallyOverlappingPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
index 1f7a359..f3ed862 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
@@ -64,9 +64,6 @@ public class RccTangentialProperPartInversePFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class RccTangentialProperPartInversePFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
index a8c1742..e62a10f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
@@ -64,9 +64,6 @@ public class RccTangentialProperPartPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class RccTangentialProperPartPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
index 913a6bd..81571ea 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
@@ -63,9 +63,6 @@ public class SfContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class SfContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class SfContainsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class SfContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class SfContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class SfContainsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
index 475483f..3f8a240 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
@@ -67,9 +67,6 @@ public class SfCrossesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class SfCrossesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -102,9 +96,6 @@ public class SfCrossesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -119,9 +110,6 @@ public class SfCrossesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -136,9 +124,6 @@ public class SfCrossesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -153,9 +138,6 @@ public class SfCrossesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -170,9 +152,6 @@ public class SfCrossesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +166,6 @@ public class SfCrossesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
index c774f01..78b9e39 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
@@ -63,9 +63,6 @@ public class SfDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class SfDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class SfDisjointPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class SfDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class SfDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class SfDisjointPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
index ba4b73e..eb936b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
@@ -64,9 +64,6 @@ public class SfEqualsPFTest {
Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class SfEqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -98,9 +92,6 @@ public class SfEqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -203,9 +179,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -223,9 +196,6 @@ public class SfEqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
index 1f42ca7..c6ddfc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
@@ -63,9 +63,6 @@ public class SfIntersectsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class SfIntersectsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class SfIntersectsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class SfIntersectsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class SfIntersectsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class SfIntersectsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
index 3a997b5..db4e642 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
@@ -65,9 +65,6 @@ public class SfOverlapsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -82,9 +79,6 @@ public class SfOverlapsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class SfOverlapsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +107,6 @@ public class SfOverlapsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class SfOverlapsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class SfOverlapsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
index c24e33d..19de489 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
@@ -64,9 +64,6 @@ public class SfTouchesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class SfTouchesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -98,9 +92,6 @@ public class SfTouchesPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class SfTouchesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class SfTouchesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class SfTouchesPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
index ac6fa77..e03aad6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
@@ -63,9 +63,6 @@ public class SfWithinPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class SfWithinPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class SfWithinPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class SfWithinPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class SfWithinPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class SfWithinPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
index 0cbbe54..76e4224 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
@@ -62,9 +62,6 @@ public class BoundaryFFTest {
BoundaryFF instance = new BoundaryFF();
NodeValue expResult = NodeValue.makeNode("LINESTRING(30 40, 30 70, 90 70, 90 40, 30 40)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -79,9 +76,6 @@ public class BoundaryFFTest {
BoundaryFF instance = new BoundaryFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> LINESTRING(30 40, 30 70, 90 70, 90 40, 30 40)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
index 05d569a..a7de18b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
@@ -71,9 +71,6 @@ public class BufferFFTest {
BufferFF instance = new BufferFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 60, 79.61570560806462 56.09819355967743, 78.47759065022574 52.3463313526982, 76.62939224605091 48.88859533960796, 74.14213562373095 45.85786437626905, 71.11140466039204 43.370607753949095, 67.6536686473018 41.522409349774264, 63.90180644032257 40.38429439193539, 60 40, 56.09819355967743 40.38429439193539, 52.34633135269821 41.522409349774264, 48.88859533960796 43.370607753949095, 4 [...]
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -89,9 +86,6 @@ public class BufferFFTest {
BufferFF instance = new BufferFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((74.39204761973815 58.93046388030052, 73.7935792641947 54.61624912638217, 72.66504878236447 50.508902633562684, 71.04982384038158 46.76626767590642, 69.00997585331788 43.53217199537903, 66.62389473285293 40.930900496430695, 63.98327645310201 39.062419002875686, 61.18959919176996 37.9985325448215, 58.35022347670747 37.78012590389699, 55.57426621468039 38.41559237986803, 52.9684071949450 [...]
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +101,6 @@ public class BufferFFTest {
BufferFF instance = new BufferFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.899820141481335 -7.499999814065095, 49.89982357682339 -7.50005416286721, 49.89983379760518 -7.500106428518575, 49.899850410726465 -7.5001546008335165, 49.8998727772313 -7.500196827054945, 49.899900036882244 -7.500231483111882, 49.89993114124498 -7.500257236082699, 49.89996489401149 -7.5002730954617265, 49.89999999701054 -7.500278451257391, 50.00000000229664 -7.500279028565501, 50.00 [...]
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +174,6 @@ public class BufferFFTest {
BufferFF instance = new BufferFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.8998 -7.5, 49.89980384294392 -7.500039018064403, 49.899815224093494 -7.500076536686473, 49.89983370607754 -7.500111114046604, 49.89985857864376 -7.500141421356237, 49.899888885953395 -7.500166293922461, 49.89992346331353 -7.500184775906503, 49.89996098193559 -7.500196157056081, 49.9 -7.5002, 50 -7.5002, 50.000039018064406 -7.500196157056081, 50.00007653668647 -7.500184775906503, 50. [...]
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
index 03c6253..3355eaa 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
@@ -61,9 +61,6 @@ public class ConvexHullFFTest {
ConvexHullFF instance = new ConvexHullFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 5, 10 10, 0 0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class ConvexHullFFTest {
ConvexHullFF instance = new ConvexHullFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
index 7bbf340..feffe37 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
@@ -62,9 +62,6 @@ public class DifferenceFFTest {
DifferenceFF instance = new DifferenceFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15), (145 30, 160 30, 160 40, 145 40, 145 30))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
index d929668..1f470bb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
@@ -65,9 +65,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 30;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0);
}
@@ -83,9 +80,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 7.2822E-6;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
index e47bc51..b48b1e3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
@@ -61,9 +61,6 @@ public class EnvelopFFTest {
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10 10)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class EnvelopFFTest {
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -93,9 +87,6 @@ public class EnvelopFFTest {
EnvelopFF instance = new EnvelopFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
index 5c811c0..ddea7cc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
@@ -62,9 +62,6 @@ public class GetSRIDFFTest {
GetSRIDFF instance = new GetSRIDFF();
NodeValue expResult = NodeValue.makeString("http://www.opengis.net/def/crs/EPSG/0/27700");
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -78,9 +75,6 @@ public class GetSRIDFFTest {
GetSRIDFF instance = new GetSRIDFF();
NodeValue expResult = NodeValue.makeString(SRS_URI.DEFAULT_WKT_CRS84);
NodeValue result = instance.exec(v);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
index 0d13327..d53b14a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
@@ -62,9 +62,6 @@ public class IntersectionFFTest {
IntersectionFF instance = new IntersectionFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 70)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -79,9 +76,6 @@ public class IntersectionFFTest {
IntersectionFF instance = new IntersectionFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 70, 80 40)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -96,9 +90,6 @@ public class IntersectionFFTest {
IntersectionFF instance = new IntersectionFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING EMPTY", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
index 4ffd552..e996362 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
@@ -62,9 +62,6 @@ public class SymmetricDifferenceFFTest {
SymmetricDifferenceFF instance = new SymmetricDifferenceFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOLYGON(((30 40, 30 70, 90 70, 90 45, 80 45, 80 40, 30 40)), ((80 40, 90 40, 90 45, 140 45, 140 15, 80 15, 80 40)))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
index 07bfd89..2955049 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
@@ -62,9 +62,6 @@ public class UnionFFTest {
UnionFF instance = new UnionFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 45, 140 45, 140 15, 80 15, 80 40, 30 40))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
index 9788609..98efdb1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
@@ -67,9 +67,6 @@ public class EhContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class EhContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class EhContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class EhContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class EhContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class EhContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class EhContainsFFTest {
EhContainsFF instance = new EhContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
index f00dfbd..eec1e8e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
@@ -69,9 +69,6 @@ public class EhCoveredByFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -86,9 +83,6 @@ public class EhCoveredByFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class EhCoveredByFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +111,6 @@ public class EhCoveredByFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -137,9 +125,6 @@ public class EhCoveredByFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -154,9 +139,6 @@ public class EhCoveredByFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -218,9 +191,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -252,9 +219,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -269,9 +233,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -286,9 +247,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -303,9 +261,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -320,9 +275,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -337,9 +289,6 @@ public class EhCoveredByFFTest {
EhCoveredByFF instance = new EhCoveredByFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
index 7b9d603..2cbcd8d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
@@ -69,9 +69,6 @@ public class EhCoversFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -86,9 +83,6 @@ public class EhCoversFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class EhCoversFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +111,6 @@ public class EhCoversFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -218,9 +191,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -252,9 +219,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -269,9 +233,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -286,9 +247,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -303,9 +261,6 @@ public class EhCoversFFTest {
EhCoversFF instance = new EhCoversFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
index 3da2b6c..004fe96 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
@@ -67,9 +67,6 @@ public class EhDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class EhDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class EhDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class EhDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class EhDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class EhDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class EhDisjointFFTest {
EhDisjointFF instance = new EhDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
index c8b9dc8..abc0220 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
@@ -67,9 +67,6 @@ public class EhEqualsFFTest {
Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class EhEqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class EhEqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class EhEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class EhEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class EhEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class EhEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -186,9 +165,6 @@ public class EhEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -352,9 +301,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -369,9 +315,6 @@ public class EhEqualsFFTest {
EhEqualsFF instance = new EhEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
index c7d99ce..bb7271b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
@@ -69,9 +69,6 @@ public class EhInsideFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -86,9 +83,6 @@ public class EhInsideFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class EhInsideFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +111,6 @@ public class EhInsideFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -137,9 +125,6 @@ public class EhInsideFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -154,9 +139,6 @@ public class EhInsideFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -171,9 +153,6 @@ public class EhInsideFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -188,9 +167,6 @@ public class EhInsideFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -203,9 +179,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -218,9 +191,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -252,9 +219,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -269,9 +233,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -286,9 +247,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -303,9 +261,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -320,9 +275,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -337,9 +289,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -354,9 +303,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -371,9 +317,6 @@ public class EhInsideFFTest {
EhInsideFF instance = new EhInsideFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
index fbac108..c7cfa65 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
@@ -69,9 +69,6 @@ public class EhMeetFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -86,9 +83,6 @@ public class EhMeetFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class EhMeetFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +111,6 @@ public class EhMeetFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -137,9 +125,6 @@ public class EhMeetFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -154,9 +139,6 @@ public class EhMeetFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -218,9 +191,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -252,9 +219,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -269,9 +233,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -286,9 +247,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -303,9 +261,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -320,9 +275,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -337,9 +289,6 @@ public class EhMeetFFTest {
EhMeetFF instance = new EhMeetFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
index ba66971..9649842 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
@@ -72,9 +72,6 @@ public class EhOverlapFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -89,9 +86,6 @@ public class EhOverlapFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -106,9 +100,6 @@ public class EhOverlapFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -123,9 +114,6 @@ public class EhOverlapFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -140,9 +128,6 @@ public class EhOverlapFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -155,9 +140,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -170,9 +152,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +166,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -204,9 +180,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -221,9 +194,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -238,9 +208,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -255,9 +222,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -272,9 +236,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -289,9 +250,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -306,9 +264,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -323,9 +278,6 @@ public class EhOverlapFFTest {
EhOverlapFF instance = new EhOverlapFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
index f9c9a09..c58d2a1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
@@ -61,9 +61,6 @@ public class CoordinateDimensionFFTest {
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class CoordinateDimensionFFTest {
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -93,9 +87,6 @@ public class CoordinateDimensionFFTest {
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -109,9 +100,6 @@ public class CoordinateDimensionFFTest {
CoordinateDimensionFF instance = new CoordinateDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(4);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
index 4dd6f94..d94b866 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
@@ -61,9 +61,6 @@ public class DimensionFFTest {
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(0);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class DimensionFFTest {
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(1);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -93,9 +87,6 @@ public class DimensionFFTest {
DimensionFF instance = new DimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
index e57a366..500b386 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
@@ -61,9 +61,6 @@ public class IsEmptyFFTest {
IsEmptyFF instance = new IsEmptyFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class IsEmptyFFTest {
IsEmptyFF instance = new IsEmptyFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
index d45768b..b2a9012 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
@@ -61,9 +61,6 @@ public class IsSimpleFFTest {
IsSimpleFF instance = new IsSimpleFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class IsSimpleFFTest {
IsSimpleFF instance = new IsSimpleFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
index 8be38a8..a625712 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
@@ -61,9 +61,6 @@ public class IsValidFFTest {
IsValidFF instance = new IsValidFF();
NodeValue expResult = NodeValue.makeNodeBoolean(true);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class IsValidFFTest {
IsValidFF instance = new IsValidFF();
NodeValue expResult = NodeValue.makeNodeBoolean(false);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
index 32105bd..ac6393b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
@@ -61,9 +61,6 @@ public class SpatialDimensionFFTest {
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class SpatialDimensionFFTest {
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -93,9 +87,6 @@ public class SpatialDimensionFFTest {
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(2);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -109,9 +100,6 @@ public class SpatialDimensionFFTest {
SpatialDimensionFF instance = new SpatialDimensionFF();
NodeValue expResult = NodeValue.makeNodeInteger(3);
NodeValue result = instance.exec(geometryLiteral);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
index b3d3a3d..ef30593 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
@@ -68,9 +68,6 @@ public class RccDisconnectedFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class RccDisconnectedFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -100,9 +94,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = true;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -200,9 +176,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -217,9 +190,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -234,9 +204,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -251,9 +218,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -268,9 +232,6 @@ public class RccDisconnectedFFTest {
RccDisconnectedFF instance = new RccDisconnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
index bd1772f..37bafb1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
@@ -68,9 +68,6 @@ public class RccEqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class RccEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -100,9 +94,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -200,9 +176,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -217,9 +190,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -234,9 +204,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -251,9 +218,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -268,9 +232,6 @@ public class RccEqualsFFTest {
RccEqualsFF instance = new RccEqualsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
index b7bdcc1..5d451d2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
@@ -67,9 +67,6 @@ public class RccExternallyConnectedFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class RccExternallyConnectedFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -165,9 +147,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class RccExternallyConnectedFFTest {
RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
index 8b6101c..6283a23 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
@@ -67,9 +67,6 @@ public class RccNonTangentialProperPartFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class RccNonTangentialProperPartFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -165,9 +147,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class RccNonTangentialProperPartFFTest {
RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
index a93fc9b..da8875a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
@@ -67,9 +67,6 @@ public class RccNonTangentialProperPartInverseFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class RccNonTangentialProperPartInverseFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -151,9 +136,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +166,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -205,9 +181,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -223,9 +196,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -241,9 +211,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -259,9 +226,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -277,9 +241,6 @@ public class RccNonTangentialProperPartInverseFFTest {
RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
index 5e724f3..9e6bd0e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
@@ -67,9 +67,6 @@ public class RccPartiallyOverlappingFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class RccPartiallyOverlappingFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -99,9 +93,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -165,9 +147,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class RccPartiallyOverlappingFFTest {
RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
index 802afc9..64f602f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
@@ -68,9 +68,6 @@ public class RccTangentialProperPartFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class RccTangentialProperPartFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -100,9 +94,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -200,9 +176,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -217,9 +190,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -234,9 +204,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -251,9 +218,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -268,9 +232,6 @@ public class RccTangentialProperPartFFTest {
RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
index 191c585..0b45d81 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
@@ -68,9 +68,6 @@ public class RccTangentialProperPartInverseFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class RccTangentialProperPartInverseFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -100,9 +94,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -133,9 +121,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -151,9 +136,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +166,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -205,9 +181,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -223,9 +196,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -241,9 +211,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -259,9 +226,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -277,9 +241,6 @@ public class RccTangentialProperPartInverseFFTest {
RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
index 9f0860f..dac6b08 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
@@ -67,9 +67,6 @@ public class SfContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class SfContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class SfContainsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class SfContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class SfContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class SfContainsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class SfContainsFFTest {
SfContainsFF instance = new SfContainsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
index 4099503..2cd27ee 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
@@ -71,9 +71,6 @@ public class SfCrossesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -89,9 +86,6 @@ public class SfCrossesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -106,9 +100,6 @@ public class SfCrossesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -123,9 +114,6 @@ public class SfCrossesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -140,9 +128,6 @@ public class SfCrossesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -157,9 +142,6 @@ public class SfCrossesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -174,9 +156,6 @@ public class SfCrossesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -191,9 +170,6 @@ public class SfCrossesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -206,9 +182,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -221,9 +194,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -238,9 +208,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -255,9 +222,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -272,9 +236,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -289,9 +250,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -306,9 +264,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -323,9 +278,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -340,9 +292,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -357,9 +306,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -374,9 +320,6 @@ public class SfCrossesFFTest {
SfCrossesFF instance = new SfCrossesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
index 9eb3e35..b70e9cf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
@@ -67,9 +67,6 @@ public class SfDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class SfDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class SfDisjointFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class SfDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class SfDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class SfDisjointFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class SfDisjointFFTest {
SfDisjointFF instance = new SfDisjointFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
index cdc34c2..a7c4e22 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
@@ -67,9 +67,6 @@ public class SfEqualsFFTest {
Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class SfEqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class SfEqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class SfEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class SfEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class SfEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class SfEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -186,9 +165,6 @@ public class SfEqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -352,9 +301,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -369,9 +315,6 @@ public class SfEqualsFFTest {
SfEqualsFF instance = new SfEqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
index 9c10ef3..b8b9fb6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
@@ -67,9 +67,6 @@ public class SfIntersectsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class SfIntersectsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class SfIntersectsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class SfIntersectsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class SfIntersectsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class SfIntersectsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class SfIntersectsFFTest {
SfIntersectsFF instance = new SfIntersectsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
index d25ee9a..b5f42bf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
@@ -69,9 +69,6 @@ public class SfOverlapsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -86,9 +83,6 @@ public class SfOverlapsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class SfOverlapsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +111,6 @@ public class SfOverlapsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -137,9 +125,6 @@ public class SfOverlapsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -154,9 +139,6 @@ public class SfOverlapsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -218,9 +191,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -252,9 +219,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -269,9 +233,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -286,9 +247,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -303,9 +261,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -320,9 +275,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -337,9 +289,6 @@ public class SfOverlapsFFTest {
SfOverlapsFF instance = new SfOverlapsFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
index 5947918..edf3be3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
@@ -68,9 +68,6 @@ public class SfTouchesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class SfTouchesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -102,9 +96,6 @@ public class SfTouchesFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -119,9 +110,6 @@ public class SfTouchesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -136,9 +124,6 @@ public class SfTouchesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -153,9 +138,6 @@ public class SfTouchesFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -168,9 +150,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -200,9 +176,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = false;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -217,9 +190,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -234,9 +204,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -251,9 +218,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -268,9 +232,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -285,9 +246,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -302,9 +260,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -319,9 +274,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -336,9 +288,6 @@ public class SfTouchesFFTest {
SfTouchesFF instance = new SfTouchesFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
index 1e11014..3b47abc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
@@ -67,9 +67,6 @@ public class SfWithinFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class SfWithinFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class SfWithinFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class SfWithinFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class SfWithinFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class SfWithinFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -167,9 +149,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +161,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -199,9 +175,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class SfWithinFFTest {
SfWithinFF instance = new SfWithinFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
index 5967e10..09d3fee 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
@@ -67,9 +67,6 @@ public class DimensionInfoTest {
Geometry geometry = factory.createPoint(coordinate);
DimensionInfo expResult = DimensionInfo.XY_POINT;
DimensionInfo result = DimensionInfo.find(coordinate, geometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class DimensionInfoTest {
Geometry geometry = factory.createLineString(coordinates.toArray(new Coordinate[coordinates.size()]));
DimensionInfo expResult = DimensionInfo.XY_LINESTRING;
DimensionInfo result = DimensionInfo.find(coordinates, geometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -102,9 +96,6 @@ public class DimensionInfoTest {
Geometry geometry = factory.createMultiPoint(points.toArray(new Point[points.size()]));
DimensionInfo expResult = DimensionInfo.XY_POINT;
DimensionInfo result = DimensionInfo.findCollection(points, geometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
index eec9c07..04fdcaf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
@@ -68,9 +68,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(2 1)";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -88,9 +85,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "POINT(1 2)";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -108,9 +102,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> LINESTRING(2 1, 20 10)";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -128,9 +119,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "LINESTRING(1 2, 10 20)";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +136,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((2 1, 2 10, 20 10, 20 1, 2 1))";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -168,9 +153,6 @@ public class GeometryWrapperFactoryTest {
String expResult = "POLYGON((1 2, 10 2, 10 20, 1 20, 1 2))";
String result = instance.asLiteral().getLexicalForm();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
index 92d2655..7f4c853 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
@@ -87,9 +87,6 @@ public class GeometryWrapperTest {
Geometry geometryTarget = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
GeometryWrapper expResult = new GeometryWrapper(geometryTarget, targetSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
GeometryWrapper result = instance.checkTransformSRS(sourceSRSGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +104,6 @@ public class GeometryWrapperTest {
CoordinateReferenceSystem expResult = CRS.forCode(sourceSRSURI);
CoordinateReferenceSystem result = instance.getCRS();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -126,9 +120,6 @@ public class GeometryWrapperTest {
//Expect the coordinates to be reversed as JTS is x,y and WGS84 is y,x
Geometry expResult = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
Geometry result = instance.getXYGeometry();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -146,9 +137,6 @@ public class GeometryWrapperTest {
Coordinate[] coordinates = {new Coordinate(-180.0, 10.0), new Coordinate(-180.0, 20.0), new Coordinate(-170.0, 20.0), new Coordinate(-170.0, 10.0), new Coordinate(-180.0, 10.0)};
Geometry expResult = GEOMETRY_FACTORY.createPolygon(coordinates);
Geometry result = instance.getXYGeometry();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -165,9 +153,6 @@ public class GeometryWrapperTest {
//Expect coordinates to be same as supplied.
Geometry expResult = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
Geometry result = instance.getParsingGeometry();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +168,6 @@ public class GeometryWrapperTest {
String expResult = SRS_URI.WGS84_CRS;
String result = instance.getSrsURI();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +183,6 @@ public class GeometryWrapperTest {
String expResult = SRS_URI.WGS84_CRS;
String result = instance.getSRID();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -219,9 +198,6 @@ public class GeometryWrapperTest {
String expResult = WKTDatatype.URI;
String result = instance.getGeometryDatatypeURI();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -247,9 +223,6 @@ public class GeometryWrapperTest {
double expResult = 10.0;
double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -275,9 +248,6 @@ public class GeometryWrapperTest {
double expResult = 0.025656; //Degree: 1.47
double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
@@ -304,9 +274,6 @@ public class GeometryWrapperTest {
double expResult = 10.0;
double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -333,9 +300,6 @@ public class GeometryWrapperTest {
double expResult = 111320; //1.0 degree of longigtude at the equator is approx 111.32km.
double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 1);
}
@@ -351,9 +315,6 @@ public class GeometryWrapperTest {
GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
GeometryWrapper expResult = GeometryWrapper.getEmptyWKT();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -370,9 +331,6 @@ public class GeometryWrapperTest {
GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
GeometryWrapper expResult = GeometryWrapper.getEmptyWKT();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -389,9 +347,6 @@ public class GeometryWrapperTest {
GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, GMLDatatype.URI, DimensionInfo.XY_POINT);
GeometryWrapper expResult = GeometryWrapper.getEmptyGML();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -408,9 +363,6 @@ public class GeometryWrapperTest {
Literal result = instance.asLiteral();
Literal expResult = ResourceFactory.createTypedLiteral(lexicalForm, WKTDatatype.INSTANCE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -428,9 +380,6 @@ public class GeometryWrapperTest {
Literal result = instance.asLiteral(GMLDatatype.URI);
String gmlGeometryLiteral = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
Literal expResult = ResourceFactory.createTypedLiteral(gmlGeometryLiteral, GMLDatatype.INSTANCE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -448,9 +397,6 @@ public class GeometryWrapperTest {
Literal result = instance.asLiteral(GMLDatatype.INSTANCE);
String gmlGeometryLiteral = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
Literal expResult = ResourceFactory.createTypedLiteral(gmlGeometryLiteral, GMLDatatype.INSTANCE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -469,9 +415,6 @@ public class GeometryWrapperTest {
double expResult = 343.77;
double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.1);
}
@@ -490,9 +433,6 @@ public class GeometryWrapperTest {
double expResult = 104.4890;
double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -511,9 +451,6 @@ public class GeometryWrapperTest {
double expResult = 104.4890;
double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -530,9 +467,6 @@ public class GeometryWrapperTest {
GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 180.0, 20.0 180.0, 20.0 190.0, 10.0 190.0, 10.0 180.0))", WKTDatatype.URI);
Geometry expResult = geometryWrapper.getXYGeometry();
Geometry result = instance.translateXYGeometry();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -548,9 +482,6 @@ public class GeometryWrapperTest {
//Exp Result is unchanged as only geographic SRS are translated.
Geometry expResult = instance.getXYGeometry();
Geometry result = instance.translateXYGeometry();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -569,9 +500,6 @@ public class GeometryWrapperTest {
double expResult = 0.0;
double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index 1b03eea..cbedabb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -67,9 +67,6 @@ public class SRSInfoTest {
Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
Envelope expResult = new Envelope(-180, 180, -90, 90);
Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -87,9 +84,6 @@ public class SRSInfoTest {
Envelope expResult = new Envelope(-180, 180, -90, 90);
Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +101,6 @@ public class SRSInfoTest {
Envelope expResult = new Envelope(-118397.00138845091, 751441.7790901454, -16627.734375018626, 1272149.3463499574);
Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -124,9 +115,6 @@ public class SRSInfoTest {
CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.WGS84_CRS);
Boolean expResult = false;
Boolean result = SRSInfo.checkAxisXY(crs);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -141,9 +129,6 @@ public class SRSInfoTest {
CoordinateReferenceSystem crs = CRS.forCode("CRS:84");
Boolean expResult = true;
Boolean result = SRSInfo.checkAxisXY(crs);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -158,9 +143,6 @@ public class SRSInfoTest {
CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.OSGB36_CRS);
Boolean expResult = true;
Boolean result = SRSInfo.checkAxisXY(crs);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
index f2909bc..8eb3563 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
@@ -102,9 +102,6 @@ public class UnitsOfMeasureTest {
UnitsOfMeasure targetUnitsOfMeasure = new UnitsOfMeasure(crs);
double expResult = 100.0;
double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -123,9 +120,6 @@ public class UnitsOfMeasureTest {
UnitsOfMeasure targetUnitsOfMeasure = new UnitsOfMeasure(crs);
double expResult = 100.0;
double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -145,9 +139,6 @@ public class UnitsOfMeasureTest {
double radsToDegrees = 180 / Math.PI;
double expResult = distance * radsToDegrees;
double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -180,9 +171,6 @@ public class UnitsOfMeasureTest {
double latitude = 0.0;
double expResult = 1.0;
double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -197,9 +185,6 @@ public class UnitsOfMeasureTest {
double latitude = 23.0;
double expResult = 1.0;
double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -214,9 +199,6 @@ public class UnitsOfMeasureTest {
double latitude = 45.0;
double expResult = 1.0;
double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -231,9 +213,6 @@ public class UnitsOfMeasureTest {
double latitude = 67.0;
double expResult = 1.0;
double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -248,9 +227,6 @@ public class UnitsOfMeasureTest {
double latitude = 67.0;
double expResult = 1.0;
double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -265,9 +241,6 @@ public class UnitsOfMeasureTest {
double latitude = 0.0;
double expResult = 111319.8922;
double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
@@ -282,9 +255,6 @@ public class UnitsOfMeasureTest {
double latitude = 23.0;
double expResult = 102470.501;
double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
@@ -299,9 +269,6 @@ public class UnitsOfMeasureTest {
double latitude = 45.0;
double expResult = 78715.050;
double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
@@ -316,9 +283,6 @@ public class UnitsOfMeasureTest {
double latitude = 67.0;
double expResult = 43496.147;
double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
@@ -333,9 +297,6 @@ public class UnitsOfMeasureTest {
double latitude = 67.0;
double expResult = 43496.15;
double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.001);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
index adcb40f..4d64208 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
@@ -93,9 +93,6 @@ public class GMLDatatypeTest {
GeometryWrapper geometry = new GeometryWrapper(point, srsURI, GMLDatatype.URI, dimensionInfo);
String result = instance.unparse(geometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
index 564eeeb..80becc5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
@@ -62,9 +62,6 @@ public class GeometryDatatypeTest {
RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
GeometryDatatype expResult = WKTDatatype.INSTANCE;
GeometryDatatype result = GeometryDatatype.get(rdfDatatype);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -88,9 +85,6 @@ public class GeometryDatatypeTest {
String datatypeURI = WKTDatatype.URI;
GeometryDatatype expResult = WKTDatatype.INSTANCE;
GeometryDatatype result = GeometryDatatype.get(datatypeURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class GeometryDatatypeTest {
String datatypeURI = WKTDatatype.URI;
boolean expResult = true;
boolean result = GeometryDatatype.checkURI(datatypeURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -119,9 +110,6 @@ public class GeometryDatatypeTest {
GeometryDatatype.checkURI(datatypeURI);
boolean expResult = false;
boolean result = GeometryDatatype.checkURI(datatypeURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -134,9 +122,6 @@ public class GeometryDatatypeTest {
RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
boolean expResult = true;
boolean result = GeometryDatatype.check(rdfDatatype);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class GeometryDatatypeTest {
RDFDatatype rdfDatatype = XSDDatatype.XSDdouble;
boolean expResult = false;
boolean result = GeometryDatatype.check(rdfDatatype);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
index e8a2ca3..bed4255 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
@@ -61,9 +61,6 @@ public class AngleTest {
double y2 = 100.0;
double expResult = Math.toRadians(42.273689);
double result = Angle.find(x1, y1, x2, y2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.000001);
}
@@ -79,9 +76,6 @@ public class AngleTest {
double y2 = 100.0;
double expResult = Math.toRadians(312.273689);
double result = Angle.find(x1, y1, x2, y2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.000001);
}
@@ -97,9 +91,6 @@ public class AngleTest {
double y2 = 45.0;
double expResult = Math.toRadians(222.273689);
double result = Angle.find(x1, y1, x2, y2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.000001);
}
@@ -115,9 +106,6 @@ public class AngleTest {
double y2 = 45.0;
double expResult = Math.toRadians(132.273689);
double result = Angle.find(x1, y1, x2, y2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.000001);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
index 21de4c8..35ab83d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
@@ -61,9 +61,6 @@ public class AzimuthTest {
double lon2 = 10.0;
double expResult = Math.toRadians(90);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -79,9 +76,6 @@ public class AzimuthTest {
double lon2 = 0.0;
double expResult = Math.toRadians(0);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -97,9 +91,6 @@ public class AzimuthTest {
double lon2 = 0.0;
double expResult = Math.toRadians(180);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -115,9 +106,6 @@ public class AzimuthTest {
double lon2 = -10.0;
double expResult = Math.toRadians(270);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -133,9 +121,6 @@ public class AzimuthTest {
double lon2 = -170.0;
double expResult = Math.toRadians(90);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -151,9 +136,6 @@ public class AzimuthTest {
double lon2 = 170.0;
double expResult = Math.toRadians(270);
double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
index 9cd580f..5059391 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
@@ -63,9 +63,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(180, 20), new Coordinate(179, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -80,9 +77,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(180, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +91,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(1, 20), new Coordinate(-1, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -114,9 +105,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(178, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -131,9 +119,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(-179, 20), new Coordinate(-178, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -148,9 +133,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(1, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -165,9 +147,6 @@ public class CoordinatePairTest {
CoordinatePair expResult = new CoordinatePair(new Coordinate(-179, 20), new Coordinate(-1, 20));
CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -184,9 +163,6 @@ public class CoordinatePairTest {
boolean expResult = true;
boolean result = instance.isEqual();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -203,9 +179,6 @@ public class CoordinatePairTest {
boolean expResult = false;
boolean result = instance.isEqual();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -222,9 +195,6 @@ public class CoordinatePairTest {
boolean expResult = true;
boolean result = instance.isEqual();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -241,9 +211,6 @@ public class CoordinatePairTest {
boolean expResult = false;
boolean result = instance.isEqual();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
index 1cd9558..fb4084d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
@@ -61,9 +61,6 @@ public class GreatCircleDistanceTest {
double lon2 = 2.34880;
double expResult = 343771;
double result = GreatCircleDistance.vincentyFormula(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 1);
}
@@ -79,9 +76,6 @@ public class GreatCircleDistanceTest {
double lon1 = 2.34880;
double expResult = 343771;
double result = GreatCircleDistance.vincentyFormula(lat1, lon1, lat2, lon2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 1);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
index ffa246a..4e2aab9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
@@ -65,9 +65,6 @@ public class GreatCirclePointDistanceTest {
GreatCirclePointDistance instance = new GreatCirclePointDistance(startLat, startLon, distance);
double expResult = 0.868348;
double result = instance.latitude(bearingRad);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -85,9 +82,6 @@ public class GreatCirclePointDistanceTest {
GreatCirclePointDistance instance = new GreatCirclePointDistance(startLat, startLon, distance);
double expResult = -0.040994;
double result = instance.longitude(endLatRad, bearingRad);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.00001);
}
@@ -101,9 +95,6 @@ public class GreatCirclePointDistanceTest {
double lonRad = 0.1;
LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(lonRad));
LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class GreatCirclePointDistanceTest {
boolean isNormaliseLon = false;
LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(lonRad));
LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad, isNormaliseLon);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class GreatCirclePointDistanceTest {
boolean isNormaliseLon = true;
LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(-Math.PI + 0.2));
LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad, isNormaliseLon);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +135,6 @@ public class GreatCirclePointDistanceTest {
double lonDegrees = 185;
double expResult = -175;
double result = GreatCirclePointDistance.normaliseLongitude(lonDegrees);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0);
}
@@ -170,9 +152,6 @@ public class GreatCirclePointDistanceTest {
double bearing = 0.0;
LatLonPoint expResult = new LatLonPoint(49.752730367761664, -2.3488);
LatLonPoint result = GreatCirclePointDistance.getPoint(startPoint, distance, bearing);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -188,9 +167,6 @@ public class GreatCirclePointDistanceTest {
double bearing = 0.0;
LatLonPoint expResult = new LatLonPoint(49.752730367761664, -2.3488);
LatLonPoint result = GreatCirclePointDistance.getPoint(startLat, startLon, distance, bearing);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -208,9 +184,6 @@ public class GreatCirclePointDistanceTest {
double bearing = 90.0;
LatLonPoint expResult = new LatLonPoint(48.84533344929755, -0.9821733277296272);
LatLonPoint result = GreatCirclePointDistance.getPoint(startPoint, distance, bearing);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -226,9 +199,6 @@ public class GreatCirclePointDistanceTest {
double bearing = 90.0;
LatLonPoint expResult = new LatLonPoint(48.84533344929755, -0.9821733277296272);
LatLonPoint result = GreatCirclePointDistance.getPoint(startLat, startLon, distance, bearing);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
index 174d459..d38d648 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
@@ -62,9 +62,6 @@ public class CoordinateSequenceDimensionsTest {
Coordinate coordinate = new Coordinate(1.0, 2.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -77,9 +74,6 @@ public class CoordinateSequenceDimensionsTest {
Coordinate coordinate = new CoordinateXY(1.0, 2.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -92,9 +86,6 @@ public class CoordinateSequenceDimensionsTest {
Coordinate coordinate = new Coordinate(1.0, 2.0, 3.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZ;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +98,6 @@ public class CoordinateSequenceDimensionsTest {
Coordinate coordinate = new CoordinateXYM(1.0, 2.0, 3.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYM;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -122,9 +110,6 @@ public class CoordinateSequenceDimensionsTest {
Coordinate coordinate = new CoordinateXYZM(1.0, 2.0, 3.0, 4.0);
CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZM;
CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
index 9cc9555..dd6973d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
@@ -65,9 +65,6 @@ public class SRSRegistryTest {
String srsURI = "http://www.opengis.net/def/crs/EPSG/0/4326";
CoordinateReferenceSystem expResult = CRS.forCode(srsURI);
CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -94,9 +91,6 @@ public class SRSRegistryTest {
CoordinateReferenceSystem expResult = CRS.fromWKT(default_CRS_WKT);
CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult.toWKT(), result.toWKT());
} catch (FactoryException ex) {
System.out.println("Default WKT CRS error: " + ex.getMessage());
@@ -113,9 +107,6 @@ public class SRSRegistryTest {
String srsURI = SRS_URI.WGS84_CRS;
Boolean expResult = false;
Boolean result = SRSRegistry.getAxisXY(srsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -129,9 +120,6 @@ public class SRSRegistryTest {
String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
Boolean expResult = true;
Boolean result = SRSRegistry.getAxisXY(srsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -145,9 +133,6 @@ public class SRSRegistryTest {
String srsURI = SRS_URI.OSGB36_CRS;
Boolean expResult = true;
Boolean result = SRSRegistry.getAxisXY(srsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
index f453601..450d1c6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
@@ -67,9 +67,6 @@ public class ConvertLatLonBoxTest {
float lonMax = 11.0F;
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))";
String result = ConvertLatLonBox.toWKT(latMin, lonMin, latMax, lonMax);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -85,9 +82,6 @@ public class ConvertLatLonBoxTest {
float lonMax = 11.0F;
Literal expResult = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
Literal result = ConvertLatLonBox.toLiteral(latMin, lonMin, latMax, lonMax);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -103,9 +97,6 @@ public class ConvertLatLonBoxTest {
NodeValue v4 = NodeValue.makeFloat(11.0f);
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
NodeValue result = ConvertLatLonBox.toNodeValue(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -121,9 +112,6 @@ public class ConvertLatLonBoxTest {
Node n4 = NodeValue.makeFloat(11.0f).asNode();
Node expResult = NodeFactory.createLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
Node result = ConvertLatLonBox.toNode(n1, n2, n3, n4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
index 908528c..03c31b2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
@@ -66,9 +66,6 @@ public class ConvertLatLonTest {
NodeValue v2 = NodeValue.makeFloat(20.0f);
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
NodeValue result = ConvertLatLon.toNodeValue(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -170,9 +167,6 @@ public class ConvertLatLonTest {
float lon = 20.0F;
String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)";
String result = ConvertLatLon.toWKT(lat, lon);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -186,9 +180,6 @@ public class ConvertLatLonTest {
float lon = 20.0F;
Literal expResult = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
Literal result = ConvertLatLon.toLiteral(lat, lon);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -202,9 +193,6 @@ public class ConvertLatLonTest {
Node n2 = NodeValue.makeFloat(20.0f).asNode();
Node expResult = NodeFactory.createLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
Node result = ConvertLatLon.toNode(n1, n2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index 5253a6c..1505132 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -76,9 +76,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.NORTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, 10, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -92,9 +89,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.SOUTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, Y1, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -108,9 +102,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-20, 160, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -124,9 +115,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-160, 20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -140,9 +128,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(100, 280, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -156,9 +141,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-200, -20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -172,9 +154,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.NORTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, 20, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -188,9 +167,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.SOUTH;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, OS_Y1, 20), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -204,9 +180,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.EAST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(10, OS_X2, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -220,9 +193,6 @@ public class SearchEnvelopeTest {
CardinalDirection direction = CardinalDirection.WEST;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, 10, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -235,9 +205,6 @@ public class SearchEnvelopeTest {
SearchEnvelope instance = new SearchEnvelope(new Envelope(0, 10, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(0, 10, 0, 10);
Envelope result = instance.getMainEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class SearchEnvelopeTest {
SearchEnvelope instance = new SearchEnvelope(new Envelope(40, 220, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(40, 180, 0, 10);
Envelope result = instance.getMainEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -265,9 +229,6 @@ public class SearchEnvelopeTest {
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
Envelope expResult = new Envelope(-180, -40, 0, 10);
Envelope result = instance.getMainEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -280,9 +241,6 @@ public class SearchEnvelopeTest {
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
Envelope expResult = new Envelope(-220, -40, 0, 10);
Envelope result = instance.getMainEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -296,9 +254,6 @@ public class SearchEnvelopeTest {
Envelope expResult = null;
Envelope result = instance.getWrapEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -312,9 +267,6 @@ public class SearchEnvelopeTest {
Envelope expResult = new Envelope(-180, -140, 0, 10);
Envelope result = instance.getWrapEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -328,9 +280,6 @@ public class SearchEnvelopeTest {
Envelope expResult = new Envelope(140, 180, 0, 10);
Envelope result = instance.getWrapEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -343,9 +292,6 @@ public class SearchEnvelopeTest {
SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
Envelope expResult = null;
Envelope result = instance.getWrapEnvelope();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -360,9 +306,6 @@ public class SearchEnvelopeTest {
String unitsURI = Unit_URI.KILOMETER_URL;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-0.08993203677616635, 0.08993203677616635, -0.08993203677616635, 0.08993203677616635), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -377,9 +320,6 @@ public class SearchEnvelopeTest {
String unitsURI = Unit_URI.KILOMETER_URL;
SearchEnvelope expResult = new SearchEnvelope(new Envelope(-10000, 10000, -10000, 10000), SpatialIndexTestData.OSGB_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -392,9 +332,6 @@ public class SearchEnvelopeTest {
GeometryWrapper geometryWrapper = SpatialIndexTestData.PARIS_GEOMETRY_WRAPPER;
SearchEnvelope expResult = new SearchEnvelope(geometryWrapper.getEnvelope(), SpatialIndexTestData.WGS_84_SRS_INFO);
SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -415,9 +352,6 @@ public class SearchEnvelopeTest {
//Function Test
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE));
HashSet<Resource> result = instance.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -438,9 +372,6 @@ public class SearchEnvelopeTest {
//Function Test
HashSet<Resource> expResult = new HashSet<>();
HashSet<Resource> result = instance.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
index 805237b..66de222 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
@@ -77,9 +77,6 @@ public class AngleDegreesFFTest {
AngleDegreesFF instance = new AngleDegreesFF();
NodeValue expResult = NodeValue.makeDouble(42.27368900609373);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
index 076588b..945af0f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
@@ -77,9 +77,6 @@ public class AngleFFTest {
AngleFF instance = new AngleFF();
NodeValue expResult = NodeValue.makeDouble(0.7378150601204649);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
index 5aef81f..0a6b3a6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
@@ -77,9 +77,6 @@ public class AzimuthDegreesFFTest {
AzimuthDegreesFF instance = new AzimuthDegreesFF();
NodeValue expResult = NodeValue.makeDouble(90);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
index 08a7712..c5aa740 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
@@ -77,9 +77,6 @@ public class AzimuthFFTest {
AzimuthFF instance = new AzimuthFF();
NodeValue expResult = NodeValue.makeDouble(1.5707963267948966);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
index 6f1cc68..56835d0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
@@ -78,9 +78,6 @@ public class ConvertLatLonBoxFFTest {
ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -97,9 +94,6 @@ public class ConvertLatLonBoxFFTest {
ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -116,9 +110,6 @@ public class ConvertLatLonBoxFFTest {
ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -135,9 +126,6 @@ public class ConvertLatLonBoxFFTest {
ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -154,9 +142,6 @@ public class ConvertLatLonBoxFFTest {
ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
index 0b8dba0..8d38507 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
@@ -76,9 +76,6 @@ public class ConvertLatLonFFTest {
ConvertLatLonFF instance = new ConvertLatLonFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -93,9 +90,6 @@ public class ConvertLatLonFFTest {
ConvertLatLonFF instance = new ConvertLatLonFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -110,9 +104,6 @@ public class ConvertLatLonFFTest {
ConvertLatLonFF instance = new ConvertLatLonFF();
NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.INSTANCE);
NodeValue result = instance.exec(v1, v2);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
index 22c3f07..c8e2519 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
@@ -80,9 +80,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 109.5057;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -98,9 +95,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 111.1950;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -116,9 +110,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 343.7713;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -134,9 +125,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
double expResult = 10;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -152,9 +140,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -170,9 +155,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -188,9 +170,6 @@ public class DistanceFFTest {
DistanceFF instance = new DistanceFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
index 669b27a..c1c2c51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
@@ -67,9 +67,6 @@ public class EqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -84,9 +81,6 @@ public class EqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +95,6 @@ public class EqualsFFTest {
Boolean expResult = true;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -118,9 +109,6 @@ public class EqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -135,9 +123,6 @@ public class EqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +137,6 @@ public class EqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -169,9 +151,6 @@ public class EqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -186,9 +165,6 @@ public class EqualsFFTest {
Boolean expResult = false;
Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -201,9 +177,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = false;
boolean result = instance.isDisjoint();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -216,9 +189,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = false;
boolean result = instance.isDisconnected();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +203,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -250,9 +217,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +231,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -284,9 +245,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -301,9 +259,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -318,9 +273,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -335,9 +287,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -352,9 +301,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -369,9 +315,6 @@ public class EqualsFFTest {
EqualsFF instance = new EqualsFF();
boolean expResult = true;
boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
index 1e39f22..826374e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
@@ -81,9 +81,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
double expResult = 109.5057;
double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -101,9 +98,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
double expResult = 111.1950;
double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -122,9 +116,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
double expResult = 343.7713;
double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -142,9 +133,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -162,9 +150,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -182,9 +167,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -202,9 +184,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -222,9 +201,6 @@ public class GreatCircleFFTest {
GreatCircleFF instance = new GreatCircleFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
index 441ba94..6b2b16a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
@@ -80,9 +80,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
double expResult = 109.5057;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -98,9 +95,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
double expResult = 111.1950;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -116,9 +110,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
double expResult = 343.7713;
double result = instance.exec(v1, v2, v3).getDouble();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result, 0.0001);
}
@@ -134,9 +125,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -152,9 +140,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -170,9 +155,6 @@ public class GreatCircleGeomFFTest {
GreatCircleGeomFF instance = new GreatCircleGeomFF();
NodeValue expResult = NodeValue.makeDouble(20);
NodeValue result = instance.exec(v1, v2, v3);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
index 488a447..d102b61 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
@@ -82,9 +82,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -101,9 +98,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -120,9 +114,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -139,9 +130,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(false);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -158,9 +146,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(false);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -176,9 +161,6 @@ public class NearbyFFTest {
String unitsURI = Unit_URI.KILOMETER_URL;
boolean expResult = true;
boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -194,9 +176,6 @@ public class NearbyFFTest {
String unitsURI = Unit_URI.KILOMETER_URL;
boolean expResult = true;
boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -212,9 +191,6 @@ public class NearbyFFTest {
String unitsURI = Unit_URI.KILOMETER_URL;
boolean expResult = false;
boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -230,9 +206,6 @@ public class NearbyFFTest {
String unitsURI = Unit_URI.KILOMETER_URL;
boolean expResult = false;
boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -249,9 +222,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -268,9 +238,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -287,9 +254,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -306,9 +270,6 @@ public class NearbyFFTest {
NearbyFF instance = new NearbyFF();
NodeValue expResult = NodeValue.makeBoolean(true);
NodeValue result = instance.exec(v1, v2, v3, v4);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
index 70b6105..352f3a0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
@@ -64,9 +64,6 @@ public class EqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -81,9 +78,6 @@ public class EqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -98,9 +92,6 @@ public class EqualsPFTest {
Boolean expResult = true;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -115,9 +106,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -132,9 +120,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +134,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -166,9 +148,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -183,9 +162,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -203,9 +179,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -223,9 +196,6 @@ public class EqualsPFTest {
Boolean expResult = false;
Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
index cc3ede2..f959986 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
@@ -90,9 +90,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -123,9 +120,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -156,9 +150,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -189,9 +180,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -222,9 +210,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -255,9 +240,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
index a1280a5..f831dcb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
@@ -95,9 +95,6 @@ public class GenericSpatialPropertyFunctionTest {
}
List<Resource> expResult = new ArrayList<>();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -128,9 +125,6 @@ public class GenericSpatialPropertyFunctionTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -162,9 +156,6 @@ public class GenericSpatialPropertyFunctionTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -196,9 +187,6 @@ public class GenericSpatialPropertyFunctionTest {
}
List<Resource> expResult = new ArrayList<>();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -233,9 +221,6 @@ public class GenericSpatialPropertyFunctionTest {
}
List<Resource> expResult = Arrays.asList(geoFeature);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
index 04dd41f..708a3b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
@@ -92,9 +92,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -127,9 +124,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -162,9 +156,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -197,9 +188,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -232,9 +220,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -267,9 +252,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -302,9 +284,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -337,9 +316,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -372,9 +348,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
index 7d3c6b8..aba4bc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
@@ -103,9 +103,6 @@ public class IntersectBoxGeomPFTest {
//Test arguments
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -142,9 +139,6 @@ public class IntersectBoxGeomPFTest {
//Test arguments
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -176,9 +170,6 @@ public class IntersectBoxGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
index ec3ac45..0b8b4bb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
@@ -102,9 +102,6 @@ public class IntersectBoxPFTest {
//Test arguments
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -140,9 +137,6 @@ public class IntersectBoxPFTest {
//Test arguments
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -173,9 +167,6 @@ public class IntersectBoxPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
index 8f35d6f..082ecf0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
@@ -103,9 +103,6 @@ public class WithinBoxGeomPFTest {
//Test arguments
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -142,9 +139,6 @@ public class WithinBoxGeomPFTest {
//Test arguments
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -176,9 +170,6 @@ public class WithinBoxGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
index 35ba433..eafb379 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
@@ -102,9 +102,6 @@ public class WithinBoxPFTest {
//Test arguments
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -140,9 +137,6 @@ public class WithinBoxPFTest {
//Test arguments
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -173,9 +167,6 @@ public class WithinBoxPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
index 822031f..76701a7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
@@ -76,9 +76,6 @@ public class EastGeomPFTest {
EastGeomPF instance = new EastGeomPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.EAST);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -96,9 +93,6 @@ public class EastGeomPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +110,6 @@ public class EastGeomPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +141,6 @@ public class EastGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
index 9461646..ac2e838 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
@@ -76,9 +76,6 @@ public class EastPFTest {
EastPF instance = new EastPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.EAST);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -96,9 +93,6 @@ public class EastPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +110,6 @@ public class EastPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +140,6 @@ public class EastPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
index 9dd4caf..9541316 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
@@ -86,9 +86,6 @@ public class GenericCardinalGeomPropertyFunctionTest {
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArgumemts, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -117,9 +114,6 @@ public class GenericCardinalGeomPropertyFunctionTest {
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArgumemts, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
index 862e466..8a09c80 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
@@ -87,9 +87,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -117,9 +114,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -147,9 +141,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -177,9 +168,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -207,9 +195,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -237,9 +222,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -267,9 +249,6 @@ public class GenericCardinalPropertyFunctionTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
index 646c992..64f160d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
@@ -74,9 +74,6 @@ public class NorthGeomPFTest {
NorthGeomPF instance = new NorthGeomPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.NORTH);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -108,9 +105,6 @@ public class NorthGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
index 1265007..659e4f4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
@@ -74,9 +74,6 @@ public class NorthPFTest {
NorthPF instance = new NorthPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.NORTH);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +104,6 @@ public class NorthPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
index 463f456..f1811a6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
@@ -74,9 +74,6 @@ public class SouthGeomPFTest {
SouthGeomPF instance = new SouthGeomPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.SOUTH);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -108,9 +105,6 @@ public class SouthGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
index 2117bc6..a17fe35 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
@@ -74,9 +74,6 @@ public class SouthPFTest {
SouthPF instance = new SouthPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.SOUTH);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -107,9 +104,6 @@ public class SouthPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
index df26bae..26fe2f2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
@@ -76,9 +76,6 @@ public class WestGeomPFTest {
WestGeomPF instance = new WestGeomPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.WEST);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -96,9 +93,6 @@ public class WestGeomPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.PERTH_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +110,6 @@ public class WestGeomPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -150,9 +141,6 @@ public class WestGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
index a815863..0835c91 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
@@ -76,9 +76,6 @@ public class WestPFTest {
WestPF instance = new WestPF();
SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.WEST);
SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -96,9 +93,6 @@ public class WestPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.PERTH_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -116,9 +110,6 @@ public class WestPFTest {
SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE));
HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -149,9 +140,6 @@ public class WestPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
index 48dce79..e2a9bf1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
@@ -97,9 +97,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -127,9 +124,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -157,9 +151,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +178,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -217,9 +205,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -247,9 +232,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -277,9 +259,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -307,9 +286,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -337,9 +313,6 @@ public class NearbyGeomPFTest {
NearbyGeomPF instance = new NearbyGeomPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -373,9 +346,6 @@ public class NearbyGeomPFTest {
//Test arguments
boolean expResult = true;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -409,9 +379,6 @@ public class NearbyGeomPFTest {
//Test arguments
boolean expResult = false;
boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -443,9 +410,6 @@ public class NearbyGeomPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -478,9 +442,6 @@ public class NearbyGeomPFTest {
}
List<Resource> expResult = new ArrayList<>();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
index 8609dfd..22f55c5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
@@ -97,9 +97,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -127,9 +124,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -157,9 +151,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -187,9 +178,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -217,9 +205,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -247,9 +232,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -277,9 +259,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -307,9 +286,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -337,9 +313,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -367,9 +340,6 @@ public class NearbyPFTest {
NearbyPF instance = new NearbyPF();
SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
//assertEquals(expResult, result);
}
@@ -400,9 +370,6 @@ public class NearbyPFTest {
}
List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
@@ -434,9 +401,6 @@ public class NearbyPFTest {
}
List<Resource> expResult = new ArrayList<>();
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
assertEquals(expResult, result);
}
}
[jena] 06/08: JENA-664: Merge commit 'refs/pull/557/head' of
https://github.com/apache/jena into geosparql
Posted by an...@apache.org.
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(-)
[jena] 02/08: - applied Apache contributors license. - cleaned up
unused imports.
Posted by an...@apache.org.
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 6f4719b4789d2c1a6b406e699a96960c8af25bce
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:23:47 2019 +0100
- applied Apache contributors license.
- cleaned up unused imports.
---
.../geosparql/configuration/GeoSPARQLConfig.java | 2 +-
.../configuration/GeoSPARQLOperations.java | 16 ++++++-------
.../jena/geosparql/configuration/ModeSRS.java | 16 ++++++-------
.../jena/geosparql/configuration/SrsException.java | 16 ++++++-------
.../GenericGeometryPropertyFunction.java | 16 +++++++------
.../geo/topological/GenericPropertyFunction.java | 6 ++---
.../topological/SpatialObjectGeometryLiteral.java | 2 +-
.../filter_functions/BoundaryFF.java | 2 +-
.../nontopological/filter_functions/BufferFF.java | 2 +-
.../filter_functions/ConvexHullFF.java | 2 +-
.../filter_functions/DifferenceFF.java | 2 +-
.../filter_functions/DistanceFF.java | 2 +-
.../nontopological/filter_functions/EnvelopFF.java | 2 +-
.../nontopological/filter_functions/GetSRIDFF.java | 2 +-
.../filter_functions/IntersectionFF.java | 2 +-
.../filter_functions/SymmetricDifferenceFF.java | 2 +-
.../nontopological/filter_functions/UnionFF.java | 2 +-
.../geof/topological/GenericFilterFunction.java | 2 +-
.../jena/geosparql/geof/topological/RelateFF.java | 2 +-
.../geometry_property/CoordinateDimensionFF.java | 2 +-
.../geometry_property/DimensionFF.java | 2 +-
.../geometry_property/IsEmptyFF.java | 2 +-
.../geometry_property/IsSimpleFF.java | 2 +-
.../geometry_property/IsValidFF.java | 2 +-
.../geometry_property/SpatialDimensionFF.java | 2 +-
.../geosparql/implementation/DimensionInfo.java | 4 ++--
.../geosparql/implementation/GeometryWrapper.java | 6 ++---
.../implementation/GeometryWrapperFactory.java | 16 ++++++-------
.../jena/geosparql/implementation/SRSInfo.java | 18 +++++++-------
.../geosparql/implementation/SRSInfoException.java | 16 ++++++-------
.../implementation/UnitsConversionException.java | 16 ++++++-------
.../implementation/datatype/GMLDatatype.java | 4 ++--
.../implementation/datatype/GeometryDatatype.java | 6 ++---
.../implementation/datatype/WKTDatatype.java | 2 +-
.../function_registration/Spatial.java | 14 ++++++-----
.../implementation/great_circle/Angle.java | 16 ++++++-------
.../implementation/great_circle/Azimuth.java | 16 ++++++-------
.../great_circle/CoordinatePair.java | 16 ++++++-------
.../great_circle/GreatCircleDistance.java | 16 ++++++-------
.../great_circle/GreatCirclePointDistance.java | 16 ++++++-------
.../implementation/great_circle/LatLonPoint.java | 16 ++++++-------
.../implementation/index/GeometryLiteralIndex.java | 2 +-
.../implementation/index/IndexConfiguration.java | 2 +-
.../jts/CoordinateSequenceDimensions.java | 16 ++++++-------
.../jts/CustomCoordinateSequence.java | 2 +-
.../implementation/parsers/gml/GMLReader.java | 16 ++++++-------
.../implementation/parsers/gml/GMLWriter.java | 2 +-
.../implementation/parsers/wkt/WKTReader.java | 6 ++---
.../implementation/registry/SRSRegistry.java | 10 ++++----
.../implementation/registry/UnitsRegistry.java | 4 ++--
.../implementation/registry/UnitsURIException.java | 16 ++++++-------
.../vocabulary/SpatialExtension.java | 14 ++++++-----
.../jena/geosparql/spatial/CardinalDirection.java | 14 ++++++-----
.../jena/geosparql/spatial/ConvertLatLon.java | 16 ++++++-------
.../jena/geosparql/spatial/ConvertLatLonBox.java | 16 ++++++-------
.../jena/geosparql/spatial/SearchEnvelope.java | 20 +++++++++-------
.../jena/geosparql/spatial/SpatialIndex.java | 28 ++++++++++++----------
.../geosparql/spatial/SpatialIndexException.java | 16 ++++++-------
.../jena/geosparql/spatial/SpatialIndexItem.java | 14 ++++++-----
.../geosparql/spatial/SpatialIndexStorage.java | 16 ++++++-------
.../spatial/filter_functions/AngleDegreesFF.java | 16 +++++++------
.../spatial/filter_functions/AngleFF.java | 16 +++++++------
.../spatial/filter_functions/AzimuthDegreesFF.java | 16 +++++++------
.../spatial/filter_functions/AzimuthFF.java | 16 +++++++------
.../filter_functions/ConvertLatLonBoxFF.java | 16 +++++++------
.../spatial/filter_functions/ConvertLatLonFF.java | 16 +++++++------
.../spatial/filter_functions/DistanceFF.java | 16 +++++++------
.../spatial/filter_functions/GreatCircleFF.java | 14 ++++++-----
.../filter_functions/GreatCircleGeomFF.java | 16 +++++++------
.../spatial/filter_functions/NearbyFF.java | 16 +++++++------
.../filter_functions/TransformDatatypeFF.java | 16 ++++++-------
.../spatial/filter_functions/TransformFF.java | 16 ++++++-------
.../spatial/filter_functions/TransformSRSFF.java | 16 ++++++-------
.../GenericSpatialGeomPropertyFunction.java | 18 +++++++-------
.../GenericSpatialPropertyFunction.java | 24 ++++++++++---------
.../property_functions/SpatialArguments.java | 16 ++++++-------
.../box/GenericSpatialBoxPropertyFunction.java | 18 +++++++-------
.../box/GenericSpatialGeomBoxPropertyFunction.java | 14 ++++++-----
.../property_functions/box/IntersectBoxGeomPF.java | 14 ++++++-----
.../property_functions/box/IntersectBoxPF.java | 14 ++++++-----
.../property_functions/box/WithinBoxGeomPF.java | 14 ++++++-----
.../property_functions/box/WithinBoxPF.java | 14 ++++++-----
.../property_functions/cardinal/EastGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/EastPF.java | 14 ++++++-----
.../GenericCardinalGeomPropertyFunction.java | 14 ++++++-----
.../cardinal/GenericCardinalPropertyFunction.java | 18 +++++++-------
.../property_functions/cardinal/NorthGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/NorthPF.java | 14 ++++++-----
.../property_functions/cardinal/SouthGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/SouthPF.java | 14 ++++++-----
.../property_functions/cardinal/WestGeomPF.java | 14 ++++++-----
.../property_functions/cardinal/WestPF.java | 14 ++++++-----
.../property_functions/nearby/NearbyGeomPF.java | 18 +++++++-------
.../property_functions/nearby/NearbyPF.java | 18 +++++++-------
.../GenericGeometryPropertyFunctionTest.java | 17 ++++++-------
.../topological/GenericPropertyFunctionTest.java | 21 ++++++++--------
.../egenhofer/EhContainsPFTest.java | 17 +++++++------
.../egenhofer/EhCoveredByPFTest.java | 18 +++++++-------
.../egenhofer/EhCoversPFTest.java | 17 +++++++------
.../egenhofer/EhDisjointPFTest.java | 17 +++++++------
.../egenhofer/EhEqualsPFTest.java | 17 +++++++------
.../egenhofer/EhInsidePFTest.java | 17 +++++++------
.../property_functions/egenhofer/EhMeetPFTest.java | 17 +++++++------
.../egenhofer/EhOverlapPFTest.java | 17 +++++++------
.../CoordinateDimensionPFTest.java | 17 +++++++------
.../geometry_property/DimensionPFTest.java | 17 +++++++------
.../geometry_property/IsEmptyPFTest.java | 17 +++++++------
.../geometry_property/IsSimplePFTest.java | 17 +++++++------
.../geometry_property/IsValidPFTest.java | 17 +++++++------
.../geometry_property/SpatialDimensionPFTest.java | 17 +++++++------
.../rcc8/RccDisconnectedPFTest.java | 17 +++++++------
.../property_functions/rcc8/RccEqualsPFTest.java | 17 +++++++------
.../rcc8/RccExternallyConnectedPFTest.java | 17 +++++++------
.../RccNonTangentialProperPartInversePFTest.java | 17 +++++++------
.../rcc8/RccNonTangentialProperPartPFTest.java | 17 +++++++------
.../rcc8/RccPartiallyOverlappingPFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartInversePFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartPFTest.java | 17 +++++++------
.../simple_features/SfContainsPFTest.java | 17 +++++++------
.../simple_features/SfCrossesPFTest.java | 17 +++++++------
.../simple_features/SfDisjointPFTest.java | 17 +++++++------
.../simple_features/SfEqualsPFTest.java | 17 +++++++------
.../simple_features/SfIntersectsPFTest.java | 17 +++++++------
.../simple_features/SfOverlapsPFTest.java | 17 +++++++------
.../simple_features/SfTouchesPFTest.java | 17 +++++++------
.../simple_features/SfWithinPFTest.java | 17 +++++++------
.../filter_functions/BoundaryFFTest.java | 1 -
.../filter_functions/BufferFFTest.java | 17 +++++++------
.../filter_functions/ConvexHullFFTest.java | 17 +++++++------
.../filter_functions/DifferenceFFTest.java | 17 +++++++------
.../filter_functions/DistanceFFTest.java | 17 +++++++------
.../filter_functions/EnvelopFFTest.java | 17 +++++++------
.../filter_functions/GetSRIDFFTest.java | 17 +++++++------
.../filter_functions/IntersectionFFTest.java | 17 +++++++------
.../SymmetricDifferenceFFTest.java | 17 +++++++------
.../filter_functions/UnionFFTest.java | 17 +++++++------
.../egenhofer/EhContainsFFTest.java | 17 +++++++------
.../egenhofer/EhCoveredByFFTest.java | 18 +++++++-------
.../filter_functions/egenhofer/EhCoversFFTest.java | 17 +++++++------
.../egenhofer/EhDisjointFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhEqualsFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhInsideFFTest.java | 17 +++++++------
.../filter_functions/egenhofer/EhMeetFFTest.java | 17 +++++++------
.../egenhofer/EhOverlapFFTest.java | 17 +++++++------
.../CoordinateDimensionFFTest.java | 17 +++++++------
.../geometry_property/DimensionFFTest.java | 17 +++++++------
.../geometry_property/IsEmptyFFTest.java | 17 +++++++------
.../geometry_property/IsSimpleFFTest.java | 17 +++++++------
.../geometry_property/IsValidFFTest.java | 17 +++++++------
.../geometry_property/SpatialDimensionFFTest.java | 17 +++++++------
.../rcc8/RccDisconnectedFFTest.java | 17 +++++++------
.../filter_functions/rcc8/RccEqualsFFTest.java | 17 +++++++------
.../rcc8/RccExternallyConnectedFFTest.java | 17 +++++++------
.../rcc8/RccNonTangentialProperPartFFTest.java | 17 +++++++------
.../RccNonTangentialProperPartInverseFFTest.java | 17 +++++++------
.../rcc8/RccPartiallyOverlappingFFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartFFTest.java | 17 +++++++------
.../rcc8/RccTangentialProperPartInverseFFTest.java | 17 +++++++------
.../simple_features/SfContainsFFTest.java | 16 ++++++-------
.../simple_features/SfCrossesFFTest.java | 16 ++++++-------
.../simple_features/SfDisjointFFTest.java | 16 ++++++-------
.../simple_features/SfEqualsFFTest.java | 17 +++++++------
.../simple_features/SfIntersectsFFTest.java | 17 +++++++------
.../simple_features/SfOverlapsFFTest.java | 17 +++++++------
.../simple_features/SfTouchesFFTest.java | 17 +++++++------
.../simple_features/SfWithinFFTest.java | 17 +++++++------
.../implementation/GeometryReverseTest.java | 1 -
.../implementation/GeometryWrapperFactoryTest.java | 6 ++---
.../implementation/GeometryWrapperTest.java | 2 --
.../implementation/UnitsOfMeasureTest.java | 2 --
.../implementation/datatype/GMLDatatypeTest.java | 3 +--
.../datatype/GeometryDatatypeTest.java | 2 --
.../implementation/datatype/WKTDatatypeTest.java | 1 -
.../jts/CoordinateSequenceDimensionsTest.java | 1 -
.../implementation/jts/GeometryTransformTest.java | 1 -
.../implementation/parsers/gml/GMLReaderTest.java | 7 +++---
.../implementation/parsers/gml/GMLWriterTest.java | 1 -
.../implementation/parsers/wkt/WKTReaderTest.java | 1 -
.../implementation/parsers/wkt/WKTWriterTest.java | 1 -
.../implementation/registry/SRSRegistryTest.java | 1 -
.../geosparql/spatial/ConvertLatLonBoxTest.java | 1 -
.../jena/geosparql/spatial/ConvertLatLonTest.java | 3 +--
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 21 ++++++++--------
.../geosparql/spatial/SpatialIndexTestData.java | 2 --
.../filter_functions/AngleDegreesFFTest.java | 5 ++--
.../spatial/filter_functions/AngleFFTest.java | 5 ++--
.../filter_functions/AzimuthDegreesFFTest.java | 5 ++--
.../spatial/filter_functions/AzimuthFFTest.java | 5 ++--
.../filter_functions/ConvertLatLonBoxFFTest.java | 7 +++---
.../filter_functions/ConvertLatLonFFTest.java | 21 ++++++++--------
.../spatial/filter_functions/DistanceFFTest.java | 9 ++++---
.../spatial/filter_functions/EqualsFFTest.java | 17 +++++++------
.../filter_functions/GreatCircleFFTest.java | 7 +++---
.../filter_functions/GreatCircleGeomFFTest.java | 9 ++++---
.../filter_functions/TransformDatatypeFFTest.java | 7 +++---
.../spatial/filter_functions/TransformFFTest.java | 7 +++---
.../filter_functions/TransformSRSFFTest.java | 7 +++---
.../spatial/property_functions/EqualsPFTest.java | 17 +++++++------
.../GenericSpatialGeomPropertyFunctionTest.java | 6 ++---
.../GenericSpatialPropertyFunctionTest.java | 8 +++----
.../box/GenericSpatialBoxPropertyFunctionTest.java | 6 ++---
.../GenericCardinalGeomPropertyFunctionTest.java | 5 ++--
.../GenericCardinalPropertyFunctionTest.java | 5 ++--
203 files changed, 1232 insertions(+), 1264 deletions(-)
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
index 77ab58e..e60742f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
@@ -17,6 +17,7 @@
*/
package org.apache.jena.geosparql.configuration;
+import java.io.File;
import org.apache.jena.geosparql.geof.topological.RelateFF;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
import org.apache.jena.geosparql.implementation.function_registration.Egenhofer;
@@ -33,7 +34,6 @@ import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.io.File;
import org.apache.jena.query.Dataset;
import org.apache.jena.sparql.function.FunctionRegistry;
import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
index bd02fa6..7150a89 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
@@ -17,14 +17,6 @@
*/
package org.apache.jena.geosparql.configuration;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.implementation.vocabulary.GeoSPARQL_URI;
-import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -40,6 +32,14 @@ import java.util.TreeSet;
import java.util.UUID;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.implementation.vocabulary.GeoSPARQL_URI;
+import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
+import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.ReadWrite;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
index 5a48f6e..46c41e4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/ModeSRS.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
index 947620b..ebc7d5f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/SrsException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
index a5d7025..5050dde 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunction.java
@@ -1,12 +1,14 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
index b2b376c..37184ea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
@@ -17,6 +17,9 @@
*/
package org.apache.jena.geosparql.geo.topological;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
@@ -24,9 +27,6 @@ import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
index 913db93..77167ac 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteral.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.geo.topological;
+import java.util.Objects;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
-import java.util.Objects;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
index 603dfec..f269952 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
index 67c2bb7..f9e73d4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
index a8c6fc9..f6850cd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
index 91f855c..ca27288 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
index 793ddbc..6e5ffd9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
index 336a944..2127d69 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
index c4e495a..f139105 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
index 170e74a..2651661 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
index c86719a..a87b62f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
index 9d5fbf0..f725388 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
index 039313d..80037dd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.geof.topological;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
index 93c51c9..740d015 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/RelateFF.java
@@ -17,9 +17,9 @@
*/
package org.apache.jena.geosparql.geof.topological;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
index b08ed8d..2df36e2 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
index 1cb1afc..555ca20 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
index b7fe00d..6b0ac14 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
index 832ee06..f5bb543 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
index ebca622..83122c4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
index 46f1409..d928e09 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFF.java
@@ -17,8 +17,8 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase1;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
index a6af415..cd9f1bd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
@@ -17,11 +17,11 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
-import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
+import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
+import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateXY;
import org.locationtech.jts.geom.Geometry;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
index 5cd208b..8e97818 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
@@ -17,6 +17,9 @@
*/
package org.apache.jena.geosparql.implementation;
+import java.io.Serializable;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
@@ -32,9 +35,6 @@ import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import java.io.Serializable;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
index 591c718..e0ff097 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactory.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
index 5256ca6..5723bc6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfo.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,12 +17,12 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import org.apache.sis.referencing.CRS;
import org.locationtech.jts.geom.Envelope;
import org.opengis.geometry.DirectPosition;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
index cb78a1b..59fe658 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/SRSInfoException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
index 6c74209..90310bf 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsConversionException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
index f5ad60b..456eb2b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatype.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
+import java.io.IOException;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.parsers.gml.GMLReader;
import org.apache.jena.geosparql.implementation.parsers.gml.GMLWriter;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import java.io.IOException;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.JDOMException;
import org.locationtech.jts.geom.Geometry;
import org.slf4j.Logger;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
index 84e18f3..6eee42b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatype.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
import org.apache.jena.datatypes.BaseDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.TypeMapper;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
index 190daf3..485ae00 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatype.java
@@ -17,12 +17,12 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTWriter;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.locationtech.jts.geom.Geometry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
index 80641fa..72704b3 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/function_registration/Spatial.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
index 3dc064d..8dc369d 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Angle.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
index 7cef0eb..3b07547 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/Azimuth.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
index 9c1708a..781ef41 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePair.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
index d17277b..3bedd79 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistance.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
index f2bd5f1..05eaaea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistance.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
index 9a4154f..abf97a5 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/great_circle/LatLonPoint.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
index 5a34e0e..762a33a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
@@ -20,9 +20,9 @@ package org.apache.jena.geosparql.implementation.index;
import io.github.galbiston.expiring_map.ExpiringMap;
import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.Map;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import java.util.Map;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
index bc3344a..2c9ef14 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/IndexConfiguration.java
@@ -19,9 +19,9 @@ package org.apache.jena.geosparql.implementation.index;
import static io.github.galbiston.expiring_map.MapDefaultValues.NO_MAP;
import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.UUID;
import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import java.util.UUID;
/**
*
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
index 9bf90b0..a0a85ac 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensions.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
index 0953645..f3451dd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequence.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import static org.apache.jena.geosparql.implementation.WKTLiteralFactory.reducePrecision;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
+import static org.apache.jena.geosparql.implementation.WKTLiteralFactory.reducePrecision;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.Envelope;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
index dcd0f46..b163a26 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReader.java
@@ -17,6 +17,14 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.SRSInfoException;
@@ -26,14 +34,6 @@ import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.parsers.ParserReader;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.JDOMException;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
index 62b9131..8ddec7e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriter.java
@@ -17,10 +17,10 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.jdom2.Element;
import org.jdom2.Namespace;
import org.jdom2.output.XMLOutputter;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
index 8447315..b9acb58 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReader.java
@@ -17,15 +17,15 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
+import java.util.Arrays;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.parsers.ParserReader;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.util.Arrays;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LineString;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
index 239ad18..a7da281 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/SRSRegistry.java
@@ -17,17 +17,17 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.SRSInfo;
-import org.apache.jena.geosparql.implementation.SRSInfoException;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.jena.geosparql.implementation.SRSInfo;
+import org.apache.jena.geosparql.implementation.SRSInfoException;
+import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import static org.apache.jena.geosparql.implementation.vocabulary.SRS_URI.EPSG_BASE_SRS_URI;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
index 561d132..c86e934 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsRegistry.java
@@ -17,13 +17,13 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.measure.Unit;
import javax.measure.quantity.Length;
+import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.sis.measure.Units;
/**
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
index 2431469..8bd057e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/registry/UnitsURIException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
index b36b2aa..903e1de 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/vocabulary/SpatialExtension.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
index bf4e52d..f32b5a6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/CardinalDirection.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
index 4e77f5f..1d50ef9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLon.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
index 5dfc114..426d50c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/ConvertLatLonBox.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
index eb3c57b..7ab0ea9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SearchEnvelope.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial;
+import java.lang.invoke.MethodHandles;
+import java.util.HashSet;
+import java.util.Objects;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
import org.apache.jena.geosparql.implementation.great_circle.GreatCirclePointDistance;
import org.apache.jena.geosparql.implementation.great_circle.LatLonPoint;
-import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
-import java.util.Objects;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.locationtech.jts.geom.Envelope;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
index ba1dd55..56008ea 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndex.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.configuration.GeoSPARQLOperations;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.SRSInfo;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -34,6 +29,13 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLOperations;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.SRSInfo;
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.query.ReadWrite;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
index 5062fda..a50bd94 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexException.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
index e3b5a97..8e6e7a0 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexItem.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
index 0ac0f5a..410e8b4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
index 6849e6f..0c5c406 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
index 2d18283..960ec20 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Angle;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
index 8e66733..2e3e588 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
index f3b94ce..9c75ae4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.great_circle.Azimuth;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
index 5748cba..8dc8cf9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
index 1b6e314..034b659 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +17,8 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase2;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
index 9f27539..0147d15 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
index 2100692..de163e6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
index 4ec4e0e..e80f0cc 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase3;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
index bbd98d7..4c031e8 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +17,9 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionBase4;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
index 9bb2946..7e7410c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
index 0321a01..1139774 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
index 9a489be..26da44b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFF.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
index fa58800..86f4316 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +17,11 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
index 9cd23a7..01102f0 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +17,11 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import org.apache.commons.collections4.iterators.IteratorChain;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
@@ -23,11 +30,6 @@ import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.apache.commons.collections4.iterators.IteratorChain;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
index abc6149..e5fde91 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/SpatialArguments.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2019 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
index 72dda0d..cf21b58 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.box;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialGeomPropertyFunction;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
index ada6af7..d7d532e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialGeomBoxPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
index 87e5756..9ff1d61 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
index 6f8fe71..94f7934 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
index 7ba220c..49382fa 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
index b034769..4ec40ee 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
index c9302dc..3334c99 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
index 7a363e3..025429e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
index d738f7e..c08b07c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
index 960b913..1bbf97a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunction.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
index 898c0d6..501c816 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
index 16619cc..e43b89f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
index c19a656..71f8a4c 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
index 05850bc..50026d9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
index c321985..3a2e67b 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
index 85787b3..d1125ca 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
index 03bf1aa..3407097 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.nearby;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.filter_functions.NearbyFF;
import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialPropertyFunction;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
index 76b76f5..7328e6e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPF.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.nearby;
+import java.util.List;
+import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.List;
-import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.graph.Node;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
index beb3cdd..531462b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +17,10 @@
*/
package org.apache.jena.geosparql.geo.topological;
-import org.apache.jena.geosparql.geo.topological.GenericGeometryPropertyFunction;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.CoordinateDimensionPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
index daed2d0..950f22b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +17,9 @@
*/
package org.apache.jena.geosparql.geo.topological;
-import org.apache.jena.geosparql.geo.topological.GenericPropertyFunction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import static org.apache.jena.geosparql.geo.topological.QueryRewriteTestData.FEATURE_A;
import static org.apache.jena.geosparql.geo.topological.QueryRewriteTestData.FEATURE_B;
@@ -35,9 +39,6 @@ import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
import org.apache.jena.geosparql.implementation.vocabulary.Geo;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.BlankNodeId;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
index b508b80..b9896b2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhContainsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
index 164156c..d51a2c2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhCoveredByPF;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhInsidePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
index 13eaf01..92b44a3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhCoversPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
index de78001..51265b5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhDisjointPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
index f22fc2c..0c3fba2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
index 95638b8..e9ec8b8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhInsidePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
index e3d70f7..22a6edb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhMeetPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
index 25301aa..f521ea1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.egenhofer;
-import org.apache.jena.geosparql.geo.topological.property_functions.egenhofer.EhOverlapPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
index 5899458..860df27 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.CoordinateDimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
index f72a08b..24fbbba 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.DimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
index a84b42c..d5f24e8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsEmptyPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
index 700765e..74f2dd7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsSimplePF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
index acdd065..a4395d4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.IsValidPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
index 81d58ae..f4e3a19 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.geometry_property;
-import org.apache.jena.geosparql.geo.topological.property_functions.geometry_property.SpatialDimensionPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
index 674a189..4d1d390 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccDisconnectedPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
index bf7ef1a..72318d0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
index 80356ca..9759c26 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccExternallyConnectedPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
index ddbb380..e7dda11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccNonTangentialProperPartInversePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
index d6499b4..1be6f78 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccNonTangentialProperPartPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
index b4e7c15..07cc3b9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccPartiallyOverlappingPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
index b4be26c..1f7a359 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccTangentialProperPartInversePF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
index 3961d36..a8c1742 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.rcc8;
-import org.apache.jena.geosparql.geo.topological.property_functions.rcc8.RccTangentialProperPartPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
index a8924a9..913a6bd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfContainsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
index 2ddb0aa..475483f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfCrossesPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
index 3bfebd5..c774f01 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfDisjointPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
index f977e97..ba4b73e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfEqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
index 8a2ee1c..1f42ca7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfIntersectsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
index 0045c1f..3a997b5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfOverlapsPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
index 952a4a8..c24e33d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfTouchesPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
index 3e10794..ac6fa77 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geo.topological.property_functions.simple_features;
-import org.apache.jena.geosparql.geo.topological.property_functions.simple_features.SfWithinPF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
import org.apache.jena.rdf.model.ResourceFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
index 59f8523..0cbbe54 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.BoundaryFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
index 6d0fe73..05d569a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.BufferFF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
index d7099ac..03c6253 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.ConvexHullFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
index c621c23..7bbf340 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.DifferenceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
index 22892a6..d929668 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.DistanceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
index 7b70adc..e47bc51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.EnvelopFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
index cba912a..5c811c0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.GetSRIDFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.sparql.expr.NodeValue;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
index 776ba0f..0d13327 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.IntersectionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
index 8092068..4ffd552 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.SymmetricDifferenceFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
index d341ebf..07bfd89 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.nontopological.filter_functions;
-import org.apache.jena.geosparql.geof.nontopological.filter_functions.UnionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
index 2f22686..9788609 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhContainsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
index 5caf8dc..f00dfbd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhCoveredByFF;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhInsideFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
index 98303bb..7b9d603 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhCoversFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
index 0c7a814..3da2b6c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhDisjointFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
index 8df8e74..c8b9dc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
index 8c3ec46..c7d99ce 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhInsideFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
index 27faa55..fbac108 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhMeetFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
index 7b2f110..ba66971 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-import org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer.EhOverlapFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
index 7c85af5..f9c9a09 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.CoordinateDimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
index c05da94..4dd6f94 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.DimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
index 1a8d01a..e57a366 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsEmptyFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
index 8e1927a..d45768b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsSimpleFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
index 324c35f..8be38a8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.IsValidFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
index aa51a27..32105bd 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property;
-import org.apache.jena.geosparql.geof.topological.filter_functions.geometry_property.SpatialDimensionFF;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.sparql.expr.NodeValue;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
index 01d9c2c..b3d3a3d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccDisconnectedFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
index 24f3c4d..bd1772f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
index 2116db9..b7bdcc1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccExternallyConnectedFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
index 2853bf3..8b6101c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccNonTangentialProperPartFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
index cbd5ef0..a93fc9b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccNonTangentialProperPartInverseFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
index 84466c2..5e724f3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccPartiallyOverlappingFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
index 569a274..802afc9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccTangentialProperPartFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
index ddaf14d..191c585 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-import org.apache.jena.geosparql.geof.topological.filter_functions.rcc8.RccTangentialProperPartInverseFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
index 67618ab..9f0860f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
index 3a7f97c..4099503 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
index 2b990da..9eb3e35 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
index d2c5a9c..cdc34c2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfEqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
index b16e4c4..9c10ef3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfIntersectsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
index 2e48b87..d25ee9a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfOverlapsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
index e30e2fb..5947918 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfTouchesFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
index 7f37686..1e11014 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-import org.apache.jena.geosparql.geof.topological.filter_functions.simple_features.SfWithinFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
index 8f77211..04f802b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryReverseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryReverse;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
index 5233551..eec9c07 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
@@ -17,12 +17,10 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.GeometryWrapperFactory;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
index 6f6a899..92d2655 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
index 814b13c..f2909bc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation;
-import org.apache.jena.geosparql.implementation.UnitsConversionException;
-import org.apache.jena.geosparql.implementation.UnitsOfMeasure;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
import org.apache.sis.referencing.CRS;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
index 14876f8..adcb40f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
+import java.io.IOException;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
@@ -25,7 +25,6 @@ import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.IOException;
import static org.hamcrest.CoreMatchers.not;
import org.jdom2.JDOMException;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
index a878e04..564eeeb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.xsd.XSDDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
index 61d63ef..ffb0514 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/WKTDatatypeTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.datatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
index fd2b4b2..174d459 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.*;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
index ae55ac0..0ab14f6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/GeometryTransformTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.jts;
-import org.apache.jena.geosparql.implementation.jts.GeometryTransformation;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
index d0e4d1d..14405d9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLReaderTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
-import org.apache.jena.geosparql.implementation.parsers.gml.GMLReader;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
import org.jdom2.JDOMException;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
index 3357d47..9db1b5f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/gml/GMLWriterTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.gml;
-import org.apache.jena.geosparql.implementation.parsers.gml.GMLWriter;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
index ef7ee6a..17a5e27 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTReaderTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
-import org.apache.jena.geosparql.implementation.parsers.wkt.WKTReader;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
index e50a5ab..624f9cf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/parsers/wkt/WKTWriterTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.parsers.wkt;
-import org.apache.jena.geosparql.implementation.parsers.wkt.WKTWriter;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
index 374fb9b..9cc9555 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.implementation.registry;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.sis.referencing.CRS;
import org.junit.After;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
index 35465e1..f453601 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
index 18d6764..908528c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
@@ -17,9 +17,8 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.ConvertLatLon;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index 8c2e9bb..5253a6c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +17,11 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.CardinalDirection;
-import org.apache.jena.geosparql.spatial.SearchEnvelope;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
+import java.util.Arrays;
+import java.util.HashSet;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import java.util.Arrays;
-import java.util.HashSet;
import org.apache.jena.rdf.model.Resource;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
index 70ae752..606e007 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SpatialIndexTestData.java
@@ -17,8 +17,6 @@
*/
package org.apache.jena.geosparql.spatial;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.SRSInfo;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
index e465afa..805237b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AngleDegreesFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
index 583e9e5..076588b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AngleFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
index 3dcedd6..5aef81f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AzimuthDegreesFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
index a8659e1..08a7712 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.AzimuthFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
index a7f0a34..6f1cc68 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.ConvertLatLonBoxFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
index 35ee668..0b8dba0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
@@ -1,11 +1,13 @@
/*
- * Copyright 2018 .
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +17,12 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.ConvertLatLonFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
index 1b0639a..22c3f07 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.DistanceFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
index 290deee..669b27a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.EqualsFF;
import org.apache.jena.geosparql.implementation.DimensionInfo;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
index 80d9cc9..1e39f22 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.GreatCircleFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
index 28fde46..441ba94 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.GreatCircleGeomFF;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
index fc1c093..79e8216 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformDatatypeFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformDatatypeFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
index ee11f6a..5d50922 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformFFTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
index 104fd96..24452a4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/TransformSRSFFTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.filter_functions;
-import org.apache.jena.geosparql.spatial.filter_functions.TransformSRSFF;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
index 86e3bdb..70b6105 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
@@ -1,13 +1,13 @@
/*
- * Copyright 2018 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
-import org.apache.jena.geosparql.spatial.property_functions.EqualsPF;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
index d883aa3..cc3ede2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
@@ -17,16 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
-import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import org.apache.jena.geosparql.spatial.property_functions.GenericSpatialGeomPropertyFunction;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.box.IntersectBoxGeomPF;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
index 69ba97d..a1280a5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
@@ -17,15 +17,15 @@
*/
package org.apache.jena.geosparql.spatial.property_functions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.SpatialIndex;
import org.apache.jena.geosparql.spatial.SpatialIndexException;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
index 5baee81..04dd41f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
@@ -17,16 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.box;
-import org.apache.jena.geosparql.spatial.property_functions.box.WithinBoxPF;
-import org.apache.jena.geosparql.spatial.property_functions.box.GenericSpatialBoxPropertyFunction;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLonBox;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
index 355e904..9dd4caf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
-import org.apache.jena.geosparql.spatial.property_functions.cardinal.NorthPF;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
index ec36d63..862e466 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
@@ -17,15 +17,14 @@
*/
package org.apache.jena.geosparql.spatial.property_functions.cardinal;
-import org.apache.jena.geosparql.spatial.property_functions.cardinal.NorthPF;
+import java.util.Arrays;
+import java.util.List;
import org.apache.jena.geosparql.implementation.GeometryWrapper;
import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
import org.apache.jena.geosparql.spatial.ConvertLatLon;
import org.apache.jena.geosparql.spatial.SearchEnvelope;
import org.apache.jena.geosparql.spatial.SpatialIndexTestData;
import org.apache.jena.geosparql.spatial.property_functions.SpatialArguments;
-import java.util.Arrays;
-import java.util.List;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Literal;
[jena] 07/08: JENA-664: Java line endings
Posted by an...@apache.org.
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 0df9471d48f9d2d0396175ab8a8fc1af1725b9bc
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed May 8 12:44:40 2019 +0100
JENA-664: Java line endings
---
.../org/apache/jena/fuseki/geosparql/Main.java | 144 +-
.../org/apache/jena/fuseki/geosparql/MainTest.java | 248 +-
.../fuseki/geosparql/cli/RDFFileParameterTest.java | 202 +-
.../fuseki/geosparql/cli/TabFileParameterTest.java | 200 +-
.../geosparql/configuration/GeoSPARQLConfig.java | 554 ++---
.../geo/topological/GenericPropertyFunction.java | 654 ++---
.../geof/topological/GenericFilterFunction.java | 162 +-
.../filter_functions/egenhofer/EhContainsFF.java | 108 +-
.../filter_functions/egenhofer/EhCoveredByFF.java | 106 +-
.../filter_functions/egenhofer/EhCoversFF.java | 106 +-
.../filter_functions/egenhofer/EhDisjointFF.java | 106 +-
.../filter_functions/egenhofer/EhEqualsFF.java | 106 +-
.../filter_functions/egenhofer/EhInsideFF.java | 106 +-
.../filter_functions/egenhofer/EhMeetFF.java | 106 +-
.../filter_functions/egenhofer/EhOverlapFF.java | 106 +-
.../filter_functions/rcc8/RccDisconnectedFF.java | 106 +-
.../filter_functions/rcc8/RccEqualsFF.java | 106 +-
.../rcc8/RccExternallyConnectedFF.java | 106 +-
.../rcc8/RccNonTangentialProperPartFF.java | 106 +-
.../rcc8/RccNonTangentialProperPartInverseFF.java | 106 +-
.../rcc8/RccPartiallyOverlappingFF.java | 108 +-
.../rcc8/RccTangentialProperPartFF.java | 106 +-
.../rcc8/RccTangentialProperPartInverseFF.java | 106 +-
.../simple_features/SfContainsFF.java | 106 +-
.../simple_features/SfCrossesFF.java | 104 +-
.../simple_features/SfDisjointFF.java | 104 +-
.../simple_features/SfEqualsFF.java | 108 +-
.../simple_features/SfIntersectsFF.java | 104 +-
.../simple_features/SfOverlapsFF.java | 104 +-
.../simple_features/SfTouchesFF.java | 104 +-
.../simple_features/SfWithinFF.java | 104 +-
.../geosparql/implementation/DimensionInfo.java | 432 ++--
.../geosparql/implementation/GeometryReverse.java | 452 ++--
.../geosparql/implementation/GeometryWrapper.java | 2496 ++++++++++----------
.../geosparql/implementation/UnitsOfMeasure.java | 448 ++--
.../implementation/index/GeometryLiteralIndex.java | 324 +--
.../index/GeometryTransformIndex.java | 318 +--
.../implementation/index/QueryRewriteIndex.java | 602 ++---
.../EgenhoferIntersectionPattern.java | 94 +-
.../RCC8IntersectionPattern.java | 84 +-
.../SimpleFeaturesIntersectionPattern.java | 56 +-
.../jts/CustomCoordinateSequence.java | 1138 ++++-----
.../jts/CustomCoordinateSequenceFactory.java | 114 +-
.../implementation/parsers/wkt/WKTReader.java | 728 +++---
.../implementation/parsers/wkt/WKTWriter.java | 580 ++---
.../implementation/registry/SRSRegistry.java | 280 +--
.../geosparql/implementation/vocabulary/Geo.java | 348 +--
.../geosparql/implementation/vocabulary/Geof.java | 164 +-
.../jena/geosparql/spatial/CardinalDirection.java | 52 +-
.../spatial/filter_functions/EqualsFF.java | 108 +-
.../GenericGeometryPropertyFunctionTest.java | 280 +--
.../topological/GenericPropertyFunctionTest.java | 1172 ++++-----
.../egenhofer/EhContainsPFTest.java | 278 +--
.../egenhofer/EhCoveredByPFTest.java | 282 +--
.../egenhofer/EhCoversPFTest.java | 226 +-
.../egenhofer/EhDisjointPFTest.java | 278 +--
.../egenhofer/EhEqualsPFTest.java | 404 ++--
.../egenhofer/EhInsidePFTest.java | 338 +--
.../property_functions/egenhofer/EhMeetPFTest.java | 282 +--
.../egenhofer/EhOverlapPFTest.java | 260 +-
.../CoordinateDimensionPFTest.java | 214 +-
.../geometry_property/DimensionPFTest.java | 188 +-
.../geometry_property/IsEmptyPFTest.java | 162 +-
.../geometry_property/IsSimplePFTest.java | 162 +-
.../geometry_property/IsValidPFTest.java | 162 +-
.../geometry_property/SpatialDimensionPFTest.java | 214 +-
.../rcc8/RccDisconnectedPFTest.java | 168 +-
.../property_functions/rcc8/RccEqualsPFTest.java | 236 +-
.../rcc8/RccExternallyConnectedPFTest.java | 166 +-
.../RccNonTangentialProperPartInversePFTest.java | 166 +-
.../rcc8/RccNonTangentialProperPartPFTest.java | 166 +-
.../rcc8/RccPartiallyOverlappingPFTest.java | 164 +-
.../rcc8/RccTangentialProperPartInversePFTest.java | 168 +-
.../rcc8/RccTangentialProperPartPFTest.java | 168 +-
.../simple_features/SfContainsPFTest.java | 278 +--
.../simple_features/SfCrossesPFTest.java | 344 +--
.../simple_features/SfDisjointPFTest.java | 278 +--
.../simple_features/SfEqualsPFTest.java | 404 ++--
.../simple_features/SfIntersectsPFTest.java | 278 +--
.../simple_features/SfOverlapsPFTest.java | 282 +--
.../simple_features/SfTouchesPFTest.java | 280 +--
.../simple_features/SfWithinPFTest.java | 278 +--
.../filter_functions/BoundaryFFTest.java | 164 +-
.../filter_functions/BufferFFTest.java | 360 +--
.../filter_functions/ConvexHullFFTest.java | 160 +-
.../filter_functions/DifferenceFFTest.java | 136 +-
.../filter_functions/DistanceFFTest.java | 172 +-
.../filter_functions/EnvelopFFTest.java | 186 +-
.../filter_functions/GetSRIDFFTest.java | 162 +-
.../filter_functions/IntersectionFFTest.java | 192 +-
.../SymmetricDifferenceFFTest.java | 136 +-
.../filter_functions/UnionFFTest.java | 136 +-
.../egenhofer/EhContainsFFTest.java | 586 ++---
.../egenhofer/EhCoveredByFFTest.java | 590 ++---
.../filter_functions/egenhofer/EhCoversFFTest.java | 532 ++---
.../egenhofer/EhDisjointFFTest.java | 584 ++---
.../filter_functions/egenhofer/EhEqualsFFTest.java | 640 ++---
.../filter_functions/egenhofer/EhInsideFFTest.java | 644 ++---
.../filter_functions/egenhofer/EhMeetFFTest.java | 588 ++---
.../egenhofer/EhOverlapFFTest.java | 566 ++---
.../CoordinateDimensionFFTest.java | 212 +-
.../geometry_property/DimensionFFTest.java | 186 +-
.../geometry_property/IsEmptyFFTest.java | 160 +-
.../geometry_property/IsSimpleFFTest.java | 160 +-
.../geometry_property/IsValidFFTest.java | 160 +-
.../geometry_property/SpatialDimensionFFTest.java | 212 +-
.../rcc8/RccDisconnectedFFTest.java | 476 ++--
.../filter_functions/rcc8/RccEqualsFFTest.java | 474 ++--
.../rcc8/RccExternallyConnectedFFTest.java | 472 ++--
.../rcc8/RccNonTangentialProperPartFFTest.java | 472 ++--
.../RccNonTangentialProperPartInverseFFTest.java | 492 ++--
.../rcc8/RccPartiallyOverlappingFFTest.java | 472 ++--
.../rcc8/RccTangentialProperPartFFTest.java | 474 ++--
.../rcc8/RccTangentialProperPartInverseFFTest.java | 492 ++--
.../simple_features/SfContainsFFTest.java | 586 ++---
.../simple_features/SfCrossesFFTest.java | 650 ++---
.../simple_features/SfDisjointFFTest.java | 584 ++---
.../simple_features/SfEqualsFFTest.java | 640 ++---
.../simple_features/SfIntersectsFFTest.java | 584 ++---
.../simple_features/SfOverlapsFFTest.java | 588 ++---
.../simple_features/SfTouchesFFTest.java | 586 ++---
.../simple_features/SfWithinFFTest.java | 584 ++---
.../implementation/GeometryReverseTest.java | 586 ++---
.../implementation/UnitsOfMeasureTest.java | 606 ++---
.../datatype/GeometryDatatypeTest.java | 280 +--
.../implementation/jts/GeometryTransformTest.java | 220 +-
.../implementation/parsers/gml/GMLReaderTest.java | 1486 ++++++------
.../implementation/parsers/wkt/WKTReaderTest.java | 994 ++++----
.../implementation/parsers/wkt/WKTWriterTest.java | 836 +++----
.../implementation/registry/SRSRegistryTest.java | 278 +--
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 756 +++---
.../geosparql/spatial/SpatialIndexTestData.java | 224 +-
.../filter_functions/ConvertLatLonFFTest.java | 286 +--
.../spatial/filter_functions/EqualsFFTest.java | 640 ++---
.../spatial/property_functions/EqualsPFTest.java | 404 ++--
.../nearby/NearbyGeomPFTest.java | 896 +++----
.../property_functions/nearby/NearbyPFTest.java | 812 +++----
137 files changed, 23900 insertions(+), 23900 deletions(-)
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
index 5ba4ea4..68dcd95 100644
--- a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
+++ b/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.fuseki.geosparql;
-
-import com.beust.jcommander.JCommander;
-import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
-import org.apache.jena.geosparql.configuration.SrsException;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
-import org.apache.jena.query.Dataset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.bridge.SLF4JBridgeHandler;
-
-public class Main {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) {
-
- //Apache SIS j.u.l logging redirection.
- SLF4JBridgeHandler.removeHandlersForRootLogger();
- SLF4JBridgeHandler.install();
-
- LOGGER.info("Arguments Received: {}", Arrays.asList(args));
-
- ArgsConfig argsConfig = new ArgsConfig();
-
- JCommander jCommander = JCommander.newBuilder()
- .addObject(argsConfig)
- .build();
-
- jCommander.setProgramName("GeoSPARQL Fuseki");
- jCommander.parse(args);
- if (argsConfig.isHelp()) {
- jCommander.usage();
- return;
- }
-
- //Setup dataset
- try {
- Dataset dataset = DatasetOperations.setup(argsConfig);
-
- //Configure server
- GeosparqlServer server = new GeosparqlServer(argsConfig.getPort(), argsConfig.getDatsetName(), argsConfig.isLoopbackOnly(), dataset, argsConfig.isUpdateAllowed());
- server.start();
- } catch (SrsException | DatasetException | SpatialIndexException ex) {
- LOGGER.error("GeoSPARQL Server: Exiting - {}: {}", ex.getMessage(), argsConfig.getDatsetName());
- }
-
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.fuseki.geosparql;
+
+import com.beust.jcommander.JCommander;
+import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
+import org.apache.jena.geosparql.configuration.SrsException;
+import org.apache.jena.geosparql.spatial.SpatialIndexException;
+import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
+import org.apache.jena.query.Dataset;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+public class Main {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ /**
+ * @param args the command line arguments
+ */
+ public static void main(String[] args) {
+
+ //Apache SIS j.u.l logging redirection.
+ SLF4JBridgeHandler.removeHandlersForRootLogger();
+ SLF4JBridgeHandler.install();
+
+ LOGGER.info("Arguments Received: {}", Arrays.asList(args));
+
+ ArgsConfig argsConfig = new ArgsConfig();
+
+ JCommander jCommander = JCommander.newBuilder()
+ .addObject(argsConfig)
+ .build();
+
+ jCommander.setProgramName("GeoSPARQL Fuseki");
+ jCommander.parse(args);
+ if (argsConfig.isHelp()) {
+ jCommander.usage();
+ return;
+ }
+
+ //Setup dataset
+ try {
+ Dataset dataset = DatasetOperations.setup(argsConfig);
+
+ //Configure server
+ GeosparqlServer server = new GeosparqlServer(argsConfig.getPort(), argsConfig.getDatsetName(), argsConfig.isLoopbackOnly(), dataset, argsConfig.isUpdateAllowed());
+ server.start();
+ } catch (SrsException | DatasetException | SpatialIndexException ex) {
+ LOGGER.error("GeoSPARQL Server: Exiting - {}: {}", ex.getMessage(), argsConfig.getDatsetName());
+ }
+
+ }
+
+}
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
index 49a4fc4..4427ad6 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
@@ -1,124 +1,124 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.fuseki.geosparql;
-
-import com.beust.jcommander.JCommander;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- *
- */
-public class MainTest {
-
- private static GeosparqlServer SERVER;
-
- public MainTest() {
- }
-
- @BeforeClass
- public static void setUpClass() throws DatasetException, SpatialIndexException {
- String[] args = {"-rf", "geosparql_test.rdf>xml", "-i"};
-
- ArgsConfig argsConfig = new ArgsConfig();
- JCommander.newBuilder()
- .addObject(argsConfig)
- .build()
- .parse(args);
-
- //Setup dataset
- Dataset dataset = DatasetOperations.setup(argsConfig);
-
- //Configure server
- SERVER = new GeosparqlServer(argsConfig.getPort(), argsConfig.getDatsetName(), argsConfig.isLoopbackOnly(), dataset, argsConfig.isUpdateAllowed());
- SERVER.start();
-
- System.out.println("Server: " + SERVER.getLocalServiceURL());
- }
-
- @AfterClass
- public static void tearDownClass() {
- SERVER.shutdown();
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
- /**
- * Test of main method, of class Main.
- */
- @Test
- public void testMain() {
- System.out.println("main");
-
- String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
- + "\n"
- + "SELECT ?obj\n"
- + "WHERE{\n"
- + " <http://example.org/Geometry#PolygonH> geo:sfContains ?obj .\n"
- + "}ORDER by ?obj";
- List<Resource> result = new ArrayList<>();
- try (QueryExecution qe = QueryExecutionFactory.sparqlService(SERVER.getLocalServiceURL(), query)) {
- ResultSet rs = qe.execSelect();
-
- while (rs.hasNext()) {
- QuerySolution qs = rs.nextSolution();
- Resource obj = qs.getResource("obj");
- result.add(obj);
- }
-
- //ResultSetFormatter.outputAsTSV(rs);
- }
-
- List<Resource> expResult = new ArrayList<>();
- expResult.add(ResourceFactory.createResource("http://example.org/Feature#A"));
- expResult.add(ResourceFactory.createResource("http://example.org/Feature#D"));
- expResult.add(ResourceFactory.createResource("http://example.org/Feature#H"));
- expResult.add(ResourceFactory.createResource("http://example.org/Feature#K"));
- expResult.add(ResourceFactory.createResource("http://example.org/Geometry#LineStringD"));
- expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PointA"));
- expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PolygonH"));
- expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PolygonK"));
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
- assertEquals(expResult, result);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.fuseki.geosparql;
+
+import com.beust.jcommander.JCommander;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.jena.fuseki.geosparql.cli.ArgsConfig;
+import org.apache.jena.geosparql.spatial.SpatialIndexException;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ *
+ */
+public class MainTest {
+
+ private static GeosparqlServer SERVER;
+
+ public MainTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws DatasetException, SpatialIndexException {
+ String[] args = {"-rf", "geosparql_test.rdf>xml", "-i"};
+
+ ArgsConfig argsConfig = new ArgsConfig();
+ JCommander.newBuilder()
+ .addObject(argsConfig)
+ .build()
+ .parse(args);
+
+ //Setup dataset
+ Dataset dataset = DatasetOperations.setup(argsConfig);
+
+ //Configure server
+ SERVER = new GeosparqlServer(argsConfig.getPort(), argsConfig.getDatsetName(), argsConfig.isLoopbackOnly(), dataset, argsConfig.isUpdateAllowed());
+ SERVER.start();
+
+ System.out.println("Server: " + SERVER.getLocalServiceURL());
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ SERVER.shutdown();
+ }
+
+ @Before
+ public void setUp() {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ /**
+ * Test of main method, of class Main.
+ */
+ @Test
+ public void testMain() {
+ System.out.println("main");
+
+ String query = "PREFIX geo: <http://www.opengis.net/ont/geosparql#>\n"
+ + "\n"
+ + "SELECT ?obj\n"
+ + "WHERE{\n"
+ + " <http://example.org/Geometry#PolygonH> geo:sfContains ?obj .\n"
+ + "}ORDER by ?obj";
+ List<Resource> result = new ArrayList<>();
+ try (QueryExecution qe = QueryExecutionFactory.sparqlService(SERVER.getLocalServiceURL(), query)) {
+ ResultSet rs = qe.execSelect();
+
+ while (rs.hasNext()) {
+ QuerySolution qs = rs.nextSolution();
+ Resource obj = qs.getResource("obj");
+ result.add(obj);
+ }
+
+ //ResultSetFormatter.outputAsTSV(rs);
+ }
+
+ List<Resource> expResult = new ArrayList<>();
+ expResult.add(ResourceFactory.createResource("http://example.org/Feature#A"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Feature#D"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Feature#H"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Feature#K"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Geometry#LineStringD"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PointA"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PolygonH"));
+ expResult.add(ResourceFactory.createResource("http://example.org/Geometry#PolygonK"));
+
+ //System.out.println("Exp: " + expResult);
+ //System.out.println("Res: " + result);
+ assertEquals(expResult, result);
+ }
+
+}
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
index c0044a3..9580cd7 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
@@ -1,101 +1,101 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.fuseki.geosparql.cli;
-
-import com.beust.jcommander.ParameterException;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.jena.riot.RDFFormat;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- *
- */
-public class RDFFileParameterTest {
-
- public RDFFileParameterTest() {
- }
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @AfterClass
- public static void tearDownClass() {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
- /**
- * Test of convert method, of class RDFFileParameter.
- */
- @Test
- public void testConvert() {
- System.out.println("convert");
- String value = "test.rdf#test>xml,test2.rdf";
- RDFFileParameter instance = new RDFFileParameter();
- List<FileGraphFormat> expResult = Arrays.asList(new FileGraphFormat(new File("test.rdf"), "test", RDFFormat.RDFXML), new FileGraphFormat(new File("test2.rdf"), "", RDFFormat.TTL));
- List<FileGraphFormat> result = instance.convert(value);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
- assertEquals(expResult, result);
- }
-
- /**
- * Test of build method, of class RDFFileParameter.
- */
- @Test
- public void testBuild() {
- System.out.println("build");
- String value = "test.rdf>xml";
- RDFFileParameter instance = new RDFFileParameter();
- FileGraphFormat expResult = new FileGraphFormat(new File("test.rdf"), "", RDFFormat.RDFXML);
- FileGraphFormat result = instance.build(value);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
- assertEquals(expResult, result);
- }
-
- /**
- * Test of validate method, of class RDFFileParameter.
- */
- @Test(expected = ParameterException.class)
- public void testValidate() {
- System.out.println("validate");
- String name = "--rdf_file";
- String value = "test.rdf>xml#test";
- RDFFileParameter instance = new RDFFileParameter();
- instance.validate(name, value);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.fuseki.geosparql.cli;
+
+import com.beust.jcommander.ParameterException;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.jena.riot.RDFFormat;
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ *
+ */
+public class RDFFileParameterTest {
+
+ public RDFFileParameterTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() {
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ }
+
+ @Before
+ public void setUp() {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ /**
+ * Test of convert method, of class RDFFileParameter.
+ */
+ @Test
+ public void testConvert() {
+ System.out.println("convert");
+ String value = "test.rdf#test>xml,test2.rdf";
+ RDFFileParameter instance = new RDFFileParameter();
+ List<FileGraphFormat> expResult = Arrays.asList(new FileGraphFormat(new File("test.rdf"), "test", RDFFormat.RDFXML), new FileGraphFormat(new File("test2.rdf"), "", RDFFormat.TTL));
+ List<FileGraphFormat> result = instance.convert(value);
+
+ //System.out.println("Exp: " + expResult);
+ //System.out.println("Res: " + result);
+ assertEquals(expResult, result);
+ }
+
+ /**
+ * Test of build method, of class RDFFileParameter.
+ */
+ @Test
+ public void testBuild() {
+ System.out.println("build");
+ String value = "test.rdf>xml";
+ RDFFileParameter instance = new RDFFileParameter();
+ FileGraphFormat expResult = new FileGraphFormat(new File("test.rdf"), "", RDFFormat.RDFXML);
+ FileGraphFormat result = instance.build(value);
+
+ //System.out.println("Exp: " + expResult);
+ //System.out.println("Res: " + result);
+ assertEquals(expResult, result);
+ }
+
+ /**
+ * Test of validate method, of class RDFFileParameter.
+ */
+ @Test(expected = ParameterException.class)
+ public void testValidate() {
+ System.out.println("validate");
+ String name = "--rdf_file";
+ String value = "test.rdf>xml#test";
+ RDFFileParameter instance = new RDFFileParameter();
+ instance.validate(name, value);
+ }
+
+}
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
index d3312ea..cb74942 100644
--- a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
+++ b/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
@@ -1,100 +1,100 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.fuseki.geosparql.cli;
-
-import com.beust.jcommander.ParameterException;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- * @author Gerg
- */
-public class TabFileParameterTest {
-
- public TabFileParameterTest() {
- }
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @AfterClass
- public static void tearDownClass() {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
- /**
- * Test of convert method, of class TabFileParameter.
- */
- @Test
- public void testConvert() {
- System.out.println("convert");
- String value = "test.rdf#test|TAB,test2.rdf";
- TabFileParameter instance = new TabFileParameter();
- List<FileGraphDelimiter> expResult = Arrays.asList(new FileGraphDelimiter(new File("test.rdf"), "test", "TAB"), new FileGraphDelimiter(new File("test2.rdf"), "", "COMMA"));
- List<FileGraphDelimiter> result = instance.convert(value);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
- assertEquals(expResult, result);
- }
-
- /**
- * Test of build method, of class TabFileParameter.
- */
- @Test
- public void testBuild() {
- System.out.println("build");
- String value = "test.rdf|SPACE";
- TabFileParameter instance = new TabFileParameter();
- FileGraphDelimiter expResult = new FileGraphDelimiter(new File("test.rdf"), "", "SPACE");
- FileGraphDelimiter result = instance.build(value);
-
- //System.out.println("Exp: " + expResult);
- //System.out.println("Res: " + result);
- assertEquals(expResult, result);
- }
-
- /**
- * Test of validate method, of class TabFileParameter.
- */
- @Test(expected = ParameterException.class)
- public void testValidate() {
- System.out.println("validate");
- String name = "--tab_file";
- String value = "test.csv|COMMA#test";
- TabFileParameter instance = new TabFileParameter();
- instance.validate(name, value);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.fuseki.geosparql.cli;
+
+import com.beust.jcommander.ParameterException;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author Gerg
+ */
+public class TabFileParameterTest {
+
+ public TabFileParameterTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() {
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ }
+
+ @Before
+ public void setUp() {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ /**
+ * Test of convert method, of class TabFileParameter.
+ */
+ @Test
+ public void testConvert() {
+ System.out.println("convert");
+ String value = "test.rdf#test|TAB,test2.rdf";
+ TabFileParameter instance = new TabFileParameter();
+ List<FileGraphDelimiter> expResult = Arrays.asList(new FileGraphDelimiter(new File("test.rdf"), "test", "TAB"), new FileGraphDelimiter(new File("test2.rdf"), "", "COMMA"));
+ List<FileGraphDelimiter> result = instance.convert(value);
+
+ //System.out.println("Exp: " + expResult);
+ //System.out.println("Res: " + result);
+ assertEquals(expResult, result);
+ }
+
+ /**
+ * Test of build method, of class TabFileParameter.
+ */
+ @Test
+ public void testBuild() {
+ System.out.println("build");
+ String value = "test.rdf|SPACE";
+ TabFileParameter instance = new TabFileParameter();
+ FileGraphDelimiter expResult = new FileGraphDelimiter(new File("test.rdf"), "", "SPACE");
+ FileGraphDelimiter result = instance.build(value);
+
+ //System.out.println("Exp: " + expResult);
+ //System.out.println("Res: " + result);
+ assertEquals(expResult, result);
+ }
+
+ /**
+ * Test of validate method, of class TabFileParameter.
+ */
+ @Test(expected = ParameterException.class)
+ public void testValidate() {
+ System.out.println("validate");
+ String name = "--tab_file";
+ String value = "test.csv|COMMA#test";
+ TabFileParameter instance = new TabFileParameter();
+ instance.validate(name, value);
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
index e60742f..7a15c06 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLConfig.java
@@ -1,277 +1,277 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.configuration;
-
-import java.io.File;
-import org.apache.jena.geosparql.geof.topological.RelateFF;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.function_registration.Egenhofer;
-import org.apache.jena.geosparql.implementation.function_registration.GeometryProperty;
-import org.apache.jena.geosparql.implementation.function_registration.NonTopological;
-import org.apache.jena.geosparql.implementation.function_registration.RCC8;
-import org.apache.jena.geosparql.implementation.function_registration.Relate;
-import org.apache.jena.geosparql.implementation.function_registration.SimpleFeatures;
-import org.apache.jena.geosparql.implementation.function_registration.Spatial;
-import org.apache.jena.geosparql.implementation.index.IndexConfiguration;
-import org.apache.jena.geosparql.implementation.index.IndexConfiguration.IndexOption;
-import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.sparql.function.FunctionRegistry;
-import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry;
-
-/**
- *
- *
- */
-public class GeoSPARQLConfig {
-
- /**
- * GeoSPARQL schema
- */
- private static Boolean IS_FUNCTIONS_REGISTERED = false;
- private static Boolean IS_QUERY_REWRITE_ENABLED = true;
-
- /**
- * Initialise all GeoSPARQL property and filter functions with memory
- * indexing.
- * <br>Use this for in-memory indexing GeoSPARQL setup. Query re-write
- * enabled.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- */
- public static final void setupMemoryIndex() {
- setup(IndexOption.MEMORY, true);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with memory
- * indexing.
- * <br>Use this for in-memory indexing GeoSPARQL setup. Query re-write
- * optional.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param isQueryRewriteEnabled
- */
- public static final void setupMemoryIndex(Boolean isQueryRewriteEnabled) {
- setup(IndexOption.MEMORY, isQueryRewriteEnabled);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with memory
- * indexing.
- * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
- * index sizes. Expiry is defaulted to 5,000 milliseconds.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param geometryLiteralIndex
- * @param geometryTransformIndex
- * @param queryRewriteIndex
- */
- public static final void setupMemoryIndexSize(Integer geometryLiteralIndex, Integer geometryTransformIndex, Integer queryRewriteIndex) {
- setup(IndexOption.MEMORY, true);
- IndexConfiguration.setIndexMaxSize(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with memory
- * indexing.
- * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
- * index expiry rate (milliseconds). Size is defaulted to unlimited.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param geometryLiteralIndex
- * @param geometryTransformIndex
- * @param queryRewriteIndex
- */
- public static final void setupMemoryIndexExpiry(Long geometryLiteralIndex, Long geometryTransformIndex, Long queryRewriteIndex) {
- setup(IndexOption.MEMORY, true);
- IndexConfiguration.setIndexExpiry(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with memory
- * indexing.
- * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
- * index sizes (default: unlimited) and expiry rate (default: 5,000
- * milliseconds).
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param geometryLiteralIndex
- * @param geometryTransformIndex
- * @param queryRewriteIndex
- * @param geometryLiteralIndexExpiry
- * @param geometryTransformIndexExpiry
- * @param queryRewriteIndexExpiry
- * @param isQueryRewriteEnabled
- */
- public static final void setupMemoryIndex(Integer geometryLiteralIndex, Integer geometryTransformIndex, Integer queryRewriteIndex, Long geometryLiteralIndexExpiry, Long geometryTransformIndexExpiry, Long queryRewriteIndexExpiry, Boolean isQueryRewriteEnabled) {
- setup(IndexOption.MEMORY, isQueryRewriteEnabled);
- IndexConfiguration.setIndexMaxSize(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
- IndexConfiguration.setIndexExpiry(geometryLiteralIndexExpiry, geometryTransformIndexExpiry, queryRewriteIndexExpiry);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with no indexing.
- * <br>Use this for no indexing GeoSPARQL setup.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- */
- public static final void setupNoIndex() {
- setup(IndexOption.NONE, true);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions with no indexing.
- * <br>Use this for no indexing GeoSPARQL setup.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param isQueryRewriteEnabled
- */
- public static final void setupNoIndex(Boolean isQueryRewriteEnabled) {
- setup(IndexOption.NONE, isQueryRewriteEnabled);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions. Query rewrite
- * enabled.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param indexOption
- */
- public static final void setup(IndexOption indexOption) {
- setup(indexOption, true);
- }
-
- /**
- * Initialise all GeoSPARQL property and filter functions.
- * <br>This does not affect the use of Spatial Indexes for Datasets.
- *
- * @param indexOption
- * @param isQueryRewriteEnabled
- */
- public static final void setup(IndexOption indexOption, Boolean isQueryRewriteEnabled) {
-
- IS_QUERY_REWRITE_ENABLED = isQueryRewriteEnabled;
-
- //Set the configuration for indexing.
- IndexConfiguration.setConfig(indexOption);
-
- //Only register functions once.
- if (!IS_FUNCTIONS_REGISTERED) {
-
- //Setup Default Cordinate Reference Systems
- SRSRegistry.setupDefaultSRS();
-
- //Register GeometryDatatypes with the TypeMapper.
- GeometryDatatype.registerDatatypes();
-
- //Register Property and Filter functions.
- PropertyFunctionRegistry propertyRegistry = PropertyFunctionRegistry.get();
- FunctionRegistry functionRegistry = FunctionRegistry.get();
- NonTopological.loadFilterFunctions(functionRegistry);
- functionRegistry.put(Geo.RELATE_NAME, RelateFF.class);
- SimpleFeatures.loadPropertyFunctions(propertyRegistry);
- SimpleFeatures.loadFilterFunctions(functionRegistry);
- Egenhofer.loadPropertyFunctions(propertyRegistry);
- Egenhofer.loadFilterFunctions(functionRegistry);
- RCC8.loadPropertyFunctions(propertyRegistry);
- RCC8.loadFilterFunctions(functionRegistry);
- Relate.loadRelateFunction(functionRegistry);
- GeometryProperty.loadPropertyFunctions(propertyRegistry);
- GeometryProperty.loadFilterFunctions(functionRegistry);
- Spatial.loadPropertyFunctions(propertyRegistry);
- Spatial.loadFilterFunctions(functionRegistry);
- IS_FUNCTIONS_REGISTERED = true;
- }
- }
-
- /**
- *
- * @return True, if the GeoSPARQL functions have been registered.
- */
- public static final Boolean isFunctionRegistered() {
- return IS_FUNCTIONS_REGISTERED;
- }
-
- /**
- * Empty all indexes and registries currently in use.
- * <br>This does not affect Spatial Indexes for Datasets.
- */
- public static final void reset() {
- //Convenience method so that setup and clearing in one class.
- IndexConfiguration.resetIndexesAndRegistries();
- }
-
- /**
- *
- * @return True if query rewrite enabled.
- */
- public static Boolean isQueryRewriteEnabled() {
- return IS_QUERY_REWRITE_ENABLED;
- }
-
- /**
- * Setup Query Rewrite Index using Dataset.<br>
- * The index will be set active.
- *
- * @param dataset
- * @param queryRewriteLabel
- * @param maxSize
- * @param expiryInterval
- */
- public static final void setupQueryRewriteIndex(Dataset dataset, String queryRewriteLabel, int maxSize, long expiryInterval) {
- QueryRewriteIndex.prepare(dataset, queryRewriteLabel, maxSize, expiryInterval);
- }
-
- /**
- * Setup Spatial Index using Dataset and most frequent SRS URI in Dataset.
- *
- * @param dataset
- */
- public static final void setupSpatialIndex(Dataset dataset) throws SpatialIndexException {
- SpatialIndex.buildSpatialIndex(dataset);
- }
-
- /**
- * Setup Spatial Index using Dataset and most frequent SRS URI in
- * Dataset.<br>
- * Spatial Index written to file once created.
- *
- * @param dataset
- * @param spatialIndexFile
- */
- public static final void setupSpatialIndex(Dataset dataset, File spatialIndexFile) throws SpatialIndexException {
- SpatialIndex.buildSpatialIndex(dataset, spatialIndexFile);
- }
-
- /**
- * Setup Spatial Index using Dataset using provided SRS URI.<br>
- * Spatial Index written to file once created.
- *
- * @param dataset
- * @param srsURI
- * @param spatialIndexFile
- */
- public static final void setupSpatialIndex(Dataset dataset, String srsURI, File spatialIndexFile) throws SpatialIndexException {
- SpatialIndex.buildSpatialIndex(dataset, srsURI, spatialIndexFile);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.configuration;
+
+import java.io.File;
+import org.apache.jena.geosparql.geof.topological.RelateFF;
+import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
+import org.apache.jena.geosparql.implementation.function_registration.Egenhofer;
+import org.apache.jena.geosparql.implementation.function_registration.GeometryProperty;
+import org.apache.jena.geosparql.implementation.function_registration.NonTopological;
+import org.apache.jena.geosparql.implementation.function_registration.RCC8;
+import org.apache.jena.geosparql.implementation.function_registration.Relate;
+import org.apache.jena.geosparql.implementation.function_registration.SimpleFeatures;
+import org.apache.jena.geosparql.implementation.function_registration.Spatial;
+import org.apache.jena.geosparql.implementation.index.IndexConfiguration;
+import org.apache.jena.geosparql.implementation.index.IndexConfiguration.IndexOption;
+import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.spatial.SpatialIndex;
+import org.apache.jena.geosparql.spatial.SpatialIndexException;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.sparql.function.FunctionRegistry;
+import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry;
+
+/**
+ *
+ *
+ */
+public class GeoSPARQLConfig {
+
+ /**
+ * GeoSPARQL schema
+ */
+ private static Boolean IS_FUNCTIONS_REGISTERED = false;
+ private static Boolean IS_QUERY_REWRITE_ENABLED = true;
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with memory
+ * indexing.
+ * <br>Use this for in-memory indexing GeoSPARQL setup. Query re-write
+ * enabled.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ */
+ public static final void setupMemoryIndex() {
+ setup(IndexOption.MEMORY, true);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with memory
+ * indexing.
+ * <br>Use this for in-memory indexing GeoSPARQL setup. Query re-write
+ * optional.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param isQueryRewriteEnabled
+ */
+ public static final void setupMemoryIndex(Boolean isQueryRewriteEnabled) {
+ setup(IndexOption.MEMORY, isQueryRewriteEnabled);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with memory
+ * indexing.
+ * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
+ * index sizes. Expiry is defaulted to 5,000 milliseconds.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param geometryLiteralIndex
+ * @param geometryTransformIndex
+ * @param queryRewriteIndex
+ */
+ public static final void setupMemoryIndexSize(Integer geometryLiteralIndex, Integer geometryTransformIndex, Integer queryRewriteIndex) {
+ setup(IndexOption.MEMORY, true);
+ IndexConfiguration.setIndexMaxSize(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with memory
+ * indexing.
+ * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
+ * index expiry rate (milliseconds). Size is defaulted to unlimited.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param geometryLiteralIndex
+ * @param geometryTransformIndex
+ * @param queryRewriteIndex
+ */
+ public static final void setupMemoryIndexExpiry(Long geometryLiteralIndex, Long geometryTransformIndex, Long queryRewriteIndex) {
+ setup(IndexOption.MEMORY, true);
+ IndexConfiguration.setIndexExpiry(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with memory
+ * indexing.
+ * <br>Use this for in-memory indexing GeoSPARQL setup and to control the
+ * index sizes (default: unlimited) and expiry rate (default: 5,000
+ * milliseconds).
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param geometryLiteralIndex
+ * @param geometryTransformIndex
+ * @param queryRewriteIndex
+ * @param geometryLiteralIndexExpiry
+ * @param geometryTransformIndexExpiry
+ * @param queryRewriteIndexExpiry
+ * @param isQueryRewriteEnabled
+ */
+ public static final void setupMemoryIndex(Integer geometryLiteralIndex, Integer geometryTransformIndex, Integer queryRewriteIndex, Long geometryLiteralIndexExpiry, Long geometryTransformIndexExpiry, Long queryRewriteIndexExpiry, Boolean isQueryRewriteEnabled) {
+ setup(IndexOption.MEMORY, isQueryRewriteEnabled);
+ IndexConfiguration.setIndexMaxSize(geometryLiteralIndex, geometryTransformIndex, queryRewriteIndex);
+ IndexConfiguration.setIndexExpiry(geometryLiteralIndexExpiry, geometryTransformIndexExpiry, queryRewriteIndexExpiry);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with no indexing.
+ * <br>Use this for no indexing GeoSPARQL setup.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ */
+ public static final void setupNoIndex() {
+ setup(IndexOption.NONE, true);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions with no indexing.
+ * <br>Use this for no indexing GeoSPARQL setup.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param isQueryRewriteEnabled
+ */
+ public static final void setupNoIndex(Boolean isQueryRewriteEnabled) {
+ setup(IndexOption.NONE, isQueryRewriteEnabled);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions. Query rewrite
+ * enabled.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param indexOption
+ */
+ public static final void setup(IndexOption indexOption) {
+ setup(indexOption, true);
+ }
+
+ /**
+ * Initialise all GeoSPARQL property and filter functions.
+ * <br>This does not affect the use of Spatial Indexes for Datasets.
+ *
+ * @param indexOption
+ * @param isQueryRewriteEnabled
+ */
+ public static final void setup(IndexOption indexOption, Boolean isQueryRewriteEnabled) {
+
+ IS_QUERY_REWRITE_ENABLED = isQueryRewriteEnabled;
+
+ //Set the configuration for indexing.
+ IndexConfiguration.setConfig(indexOption);
+
+ //Only register functions once.
+ if (!IS_FUNCTIONS_REGISTERED) {
+
+ //Setup Default Cordinate Reference Systems
+ SRSRegistry.setupDefaultSRS();
+
+ //Register GeometryDatatypes with the TypeMapper.
+ GeometryDatatype.registerDatatypes();
+
+ //Register Property and Filter functions.
+ PropertyFunctionRegistry propertyRegistry = PropertyFunctionRegistry.get();
+ FunctionRegistry functionRegistry = FunctionRegistry.get();
+ NonTopological.loadFilterFunctions(functionRegistry);
+ functionRegistry.put(Geo.RELATE_NAME, RelateFF.class);
+ SimpleFeatures.loadPropertyFunctions(propertyRegistry);
+ SimpleFeatures.loadFilterFunctions(functionRegistry);
+ Egenhofer.loadPropertyFunctions(propertyRegistry);
+ Egenhofer.loadFilterFunctions(functionRegistry);
+ RCC8.loadPropertyFunctions(propertyRegistry);
+ RCC8.loadFilterFunctions(functionRegistry);
+ Relate.loadRelateFunction(functionRegistry);
+ GeometryProperty.loadPropertyFunctions(propertyRegistry);
+ GeometryProperty.loadFilterFunctions(functionRegistry);
+ Spatial.loadPropertyFunctions(propertyRegistry);
+ Spatial.loadFilterFunctions(functionRegistry);
+ IS_FUNCTIONS_REGISTERED = true;
+ }
+ }
+
+ /**
+ *
+ * @return True, if the GeoSPARQL functions have been registered.
+ */
+ public static final Boolean isFunctionRegistered() {
+ return IS_FUNCTIONS_REGISTERED;
+ }
+
+ /**
+ * Empty all indexes and registries currently in use.
+ * <br>This does not affect Spatial Indexes for Datasets.
+ */
+ public static final void reset() {
+ //Convenience method so that setup and clearing in one class.
+ IndexConfiguration.resetIndexesAndRegistries();
+ }
+
+ /**
+ *
+ * @return True if query rewrite enabled.
+ */
+ public static Boolean isQueryRewriteEnabled() {
+ return IS_QUERY_REWRITE_ENABLED;
+ }
+
+ /**
+ * Setup Query Rewrite Index using Dataset.<br>
+ * The index will be set active.
+ *
+ * @param dataset
+ * @param queryRewriteLabel
+ * @param maxSize
+ * @param expiryInterval
+ */
+ public static final void setupQueryRewriteIndex(Dataset dataset, String queryRewriteLabel, int maxSize, long expiryInterval) {
+ QueryRewriteIndex.prepare(dataset, queryRewriteLabel, maxSize, expiryInterval);
+ }
+
+ /**
+ * Setup Spatial Index using Dataset and most frequent SRS URI in Dataset.
+ *
+ * @param dataset
+ */
+ public static final void setupSpatialIndex(Dataset dataset) throws SpatialIndexException {
+ SpatialIndex.buildSpatialIndex(dataset);
+ }
+
+ /**
+ * Setup Spatial Index using Dataset and most frequent SRS URI in
+ * Dataset.<br>
+ * Spatial Index written to file once created.
+ *
+ * @param dataset
+ * @param spatialIndexFile
+ */
+ public static final void setupSpatialIndex(Dataset dataset, File spatialIndexFile) throws SpatialIndexException {
+ SpatialIndex.buildSpatialIndex(dataset, spatialIndexFile);
+ }
+
+ /**
+ * Setup Spatial Index using Dataset using provided SRS URI.<br>
+ * Spatial Index written to file once created.
+ *
+ * @param dataset
+ * @param srsURI
+ * @param spatialIndexFile
+ */
+ public static final void setupSpatialIndex(Dataset dataset, String srsURI, File spatialIndexFile) throws SpatialIndexException {
+ SpatialIndex.buildSpatialIndex(dataset, srsURI, spatialIndexFile);
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
index 37184ea..138697a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunction.java
@@ -1,327 +1,327 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geo.topological;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
-import org.apache.jena.geosparql.implementation.vocabulary.Geo;
-import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
-import org.apache.jena.geosparql.spatial.SpatialIndex;
-import org.apache.jena.geosparql.spatial.SpatialIndexException;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.engine.ExecutionContext;
-import org.apache.jena.sparql.engine.QueryIterator;
-import org.apache.jena.sparql.engine.binding.Binding;
-import org.apache.jena.sparql.engine.binding.BindingFactory;
-import org.apache.jena.sparql.engine.iterator.QueryIterConcat;
-import org.apache.jena.sparql.engine.iterator.QueryIterNullIterator;
-import org.apache.jena.sparql.engine.iterator.QueryIterSingleton;
-import org.apache.jena.sparql.expr.ExprEvalException;
-import org.apache.jena.sparql.pfunction.PFuncSimple;
-import org.apache.jena.sparql.util.FmtUtils;
-import org.apache.jena.util.iterator.ExtendedIterator;
-import org.apache.jena.vocabulary.RDF;
-import org.locationtech.jts.geom.Envelope;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- *
- */
-public abstract class GenericPropertyFunction extends PFuncSimple {
-
- private final GenericFilterFunction filterFunction;
-
- public GenericPropertyFunction(GenericFilterFunction filterFunction) {
- this.filterFunction = filterFunction;
- }
-
- @Override
- public QueryIterator execEvaluated(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
- if (object.isLiteral()) {
- //These Property Functions do not accept literals as objects so exit quickly.
- return QueryIterNullIterator.create(execCxt);
- }
-
- if (subject.isConcrete() && object.isConcrete()) {
- //Both are bound.
- return bothBound(binding, subject, predicate, object, execCxt);
- } else if (subject.isVariable() && object.isVariable()) {
- //Both are unbound.
- return bothUnbound(binding, subject, predicate, object, execCxt);
- } else {
- //One bound and one unbound.
- return oneBound(binding, subject, predicate, object, execCxt);
- }
-
- }
-
- private QueryIterator bothBound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
-
- Graph graph = execCxt.getActiveGraph();
- QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.retrieve(execCxt);
-
- Boolean isPositiveResult = queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
- if (isPositiveResult) {
- //Filter function test succeded so retain binding.
- return QueryIterSingleton.create(binding, execCxt);
- } else {
- //Filter function test failed so null result.
- return QueryIterNullIterator.create(execCxt);
- }
-
- }
-
- private QueryIterator bothUnbound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
-
- QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
- Var subjectVar = Var.alloc(subject.getName());
-
- Graph graph = execCxt.getActiveGraph();
-
- ExtendedIterator<Triple> subjectTriples;
- if (graph.contains(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
- subjectTriples = graph.find(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE);
- } else {
- //Check for Geo Predicate Features in the Graph if no GeometryLiterals found.
- subjectTriples = graph.find(null, SpatialExtension.GEO_LAT_NODE, null);
-
- }
-
- //Bind all the Spatial Objects or Geo Predicates once as the subject and search for corresponding Objects.
- while (subjectTriples.hasNext()) {
- Triple subjectTriple = subjectTriples.next();
- Node boundSubject = subjectTriple.getSubject();
- Binding subjectBind = BindingFactory.binding(binding, subjectVar, boundSubject);
- QueryIterator queryIter = oneBound(subjectBind, boundSubject, predicate, object, execCxt);
- queryIterConcat.add(queryIter);
- }
-
- return queryIterConcat;
- }
-
- private QueryIterator oneBound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
-
- Graph graph = execCxt.getActiveGraph();
- Node boundNode;
- Node unboundNode;
- Boolean isSubjectBound;
- if (subject.isConcrete()) {
- //Subject is bound, object is unbound.
- boundNode = subject;
- unboundNode = object;
- isSubjectBound = true;
- } else {
- //Object is bound, subject is unbound.
- boundNode = object;
- unboundNode = subject;
- isSubjectBound = false;
- }
-
- if (!graph.contains(boundNode, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
- if (!graph.contains(boundNode, SpatialExtension.GEO_LAT_NODE, null)) {
- //Bound node is not a Feature or a Geometry or has Geo predicates so exit.
- return QueryIterNullIterator.create(execCxt);
- }
- }
-
- boolean isSpatialIndex = SpatialIndex.isDefined(execCxt);
- QueryIterConcat queryIterConcat;
- if (!isSpatialIndex || filterFunction.isDisjoint() || filterFunction.isDisconnected()) {
- //Disjointed so retrieve all cases.
- queryIterConcat = findAll(graph, boundNode, unboundNode, binding, isSubjectBound, predicate, execCxt);
- } else {
- //Only retrieve those in the spatial index which are within same bounding box.
- queryIterConcat = findIndex(graph, boundNode, unboundNode, binding, isSubjectBound, predicate, execCxt);
- }
-
- return queryIterConcat;
- }
-
- private QueryIterConcat findAll(Graph graph, Node boundNode, Node unboundNode, Binding binding, boolean isSubjectBound, Node predicate, ExecutionContext execCxt) {
-
- //Prepare the results.
- Var unboundVar = Var.alloc(unboundNode.getName());
- QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
-
- //Search for both Features and Geometry in the Graph.
- ExtendedIterator<Triple> spatialTriples;
- if (graph.contains(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
- spatialTriples = graph.find(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE);
- } else {
- //Check for Geo Predicate Features in the Graph if no GeometryLiterals found.
- spatialTriples = graph.find(null, SpatialExtension.GEO_LAT_NODE, null);
- }
-
- while (spatialTriples.hasNext()) {
- Triple spatialTriple = spatialTriples.next();
- Node spatialNode = spatialTriple.getSubject();
- Binding newBind = BindingFactory.binding(binding, unboundVar, spatialNode);
- QueryIterator queryIter;
- if (isSubjectBound) {
- queryIter = bothBound(newBind, boundNode, predicate, spatialNode, execCxt);
- } else {
- queryIter = bothBound(newBind, spatialNode, predicate, boundNode, execCxt);
- }
- queryIterConcat.add(queryIter);
- }
-
- return queryIterConcat;
- }
-
- private QueryIterConcat findIndex(Graph graph, Node boundNode, Node unboundNode, Binding binding, boolean isSubjectBound, Node predicate, ExecutionContext execCxt) throws ExprEvalException {
-
- try {
- //Prepare for results.
- Var unboundVar = Var.alloc(unboundNode.getName());
- QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
-
- //Find the asserted triples.
- List<Node> assertedNodes = findAsserted(graph, boundNode, isSubjectBound, predicate);
- for (Node node : assertedNodes) {
- Binding newBind = BindingFactory.binding(binding, unboundVar, node);
- QueryIterator queryIter = QueryIterSingleton.create(newBind, execCxt);
- queryIterConcat.add(queryIter);
- }
-
- //Find the GeometryLiteral of the Bound Node.
- SpatialObjectGeometryLiteral boundGeometryLiteral = SpatialObjectGeometryLiteral.retrieve(graph, boundNode);
- if (!boundGeometryLiteral.isValid()) {
- //Bound Node is not a Feature or a Geometry or there is no GeometryLiteral so exit.
- return queryIterConcat;
- }
-
- Node geometryLiteral = boundGeometryLiteral.getGeometryLiteral();
-
- //Perform the search of the Spatial Index of the Dataset.
- SpatialIndex spatialIndex = SpatialIndex.retrieve(execCxt);
- GeometryWrapper geom = GeometryWrapper.extract(geometryLiteral);
- GeometryWrapper transformedGeom = geom.transform(spatialIndex.getSrsInfo());
- Envelope searchEnvelope = transformedGeom.getEnvelope();
- HashSet<Resource> features = spatialIndex.query(searchEnvelope);
-
- //Check each of the Features that match the search.
- for (Resource feature : features) {
- Node featureNode = feature.asNode();
-
- //Ensure not already an asserted node.
- if (!assertedNodes.contains(featureNode)) {
-
- Binding newBind = BindingFactory.binding(binding, unboundVar, featureNode);
- QueryIterator queryIter;
- if (isSubjectBound) {
- queryIter = bothBound(newBind, boundNode, predicate, featureNode, execCxt);
- } else {
- queryIter = bothBound(newBind, featureNode, predicate, boundNode, execCxt);
- }
- queryIterConcat.add(queryIter);
- }
-
- //Also test all Geometry of the Features. All, some or one Geometry may have matched.
- ExtendedIterator<Triple> featureGeometryTriples = graph.find(feature.asNode(), Geo.HAS_GEOMETRY_NODE, null);
- while (featureGeometryTriples.hasNext()) {
- Triple unboundTriple = featureGeometryTriples.next();
- Node geomNode = unboundTriple.getObject();
-
- //Ensure not already an asserted node.
- if (!assertedNodes.contains(geomNode)) {
- Binding newBind = BindingFactory.binding(binding, unboundVar, geomNode);
- QueryIterator queryIter;
- if (isSubjectBound) {
- queryIter = bothBound(newBind, boundNode, predicate, geomNode, execCxt);
- } else {
- queryIter = bothBound(newBind, geomNode, predicate, boundNode, execCxt);
- }
- queryIterConcat.add(queryIter);
- }
- }
- }
-
- return queryIterConcat;
- } catch (MismatchedDimensionException | TransformException | FactoryException | SpatialIndexException ex) {
- throw new ExprEvalException(ex.getMessage() + ": " + FmtUtils.stringForNode(boundNode) + ", " + FmtUtils.stringForNode(unboundNode) + ", " + FmtUtils.stringForNode(predicate), ex);
- }
- }
-
- private List<Node> findAsserted(Graph graph, Node boundNode, boolean isSubjectBound, Node predicate) {
- List<Node> assertedNodes = new ArrayList<>();
- if (isSubjectBound) {
- ExtendedIterator<Triple> assertedTriples = graph.find(boundNode, predicate, null);
- while (assertedTriples.hasNext()) {
- Node assertedNode = assertedTriples.next().getObject();
- assertedNodes.add(assertedNode);
- }
- } else {
- ExtendedIterator<Triple> assertedTriples = graph.find(null, predicate, boundNode);
- while (assertedTriples.hasNext()) {
- Node assertedNode = assertedTriples.next().getSubject();
- assertedNodes.add(assertedNode);
- }
- }
- return assertedNodes;
- }
-
- protected final Boolean queryRewrite(Graph graph, Node subject, Node predicate, Node object, QueryRewriteIndex queryRewriteIndex) {
-
- if (graph.contains(subject, predicate, object)) {
- //The graph contains the asserted triple, return the current binding.
- return true;
- }
-
- //If query re-writing is disabled then exit - already checked that graph does not contain the asserted relation.
- if (!queryRewriteIndex.isIndexActive()) {
- return false;
- }
-
- //Begin Query Re-write by finding the literals of the Feature or Geometry.
- SpatialObjectGeometryLiteral subjectSpatialLiteral = SpatialObjectGeometryLiteral.retrieve(graph, subject);
- if (!subjectSpatialLiteral.isValid()) {
- //Subject is not a Feature or a Geometry or there is no GeometryLiteral so exit.
- return false;
- }
-
- SpatialObjectGeometryLiteral objectSpatialLiteral = SpatialObjectGeometryLiteral.retrieve(graph, object);
- if (!objectSpatialLiteral.isValid()) {
- //Object is not a Feature or a Geometry or there is no GeometryLiteral so exit.
- return false;
- }
-
- //Check the QueryRewriteIndex for the result.
- Property predicateProp = ResourceFactory.createProperty(predicate.getURI());
- Boolean isPositive = queryRewriteIndex.test(subjectSpatialLiteral.getGeometryLiteral(), predicateProp, objectSpatialLiteral.getGeometryLiteral(), this);
- return isPositive;
- }
-
- public Boolean testFilterFunction(Node subjectGeometryLiteral, Node objectGeometryLiteral) {
- return filterFunction.exec(subjectGeometryLiteral, objectGeometryLiteral);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geo.topological;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.index.QueryRewriteIndex;
+import org.apache.jena.geosparql.implementation.vocabulary.Geo;
+import org.apache.jena.geosparql.implementation.vocabulary.SpatialExtension;
+import org.apache.jena.geosparql.spatial.SpatialIndex;
+import org.apache.jena.geosparql.spatial.SpatialIndexException;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.ExecutionContext;
+import org.apache.jena.sparql.engine.QueryIterator;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.engine.binding.BindingFactory;
+import org.apache.jena.sparql.engine.iterator.QueryIterConcat;
+import org.apache.jena.sparql.engine.iterator.QueryIterNullIterator;
+import org.apache.jena.sparql.engine.iterator.QueryIterSingleton;
+import org.apache.jena.sparql.expr.ExprEvalException;
+import org.apache.jena.sparql.pfunction.PFuncSimple;
+import org.apache.jena.sparql.util.FmtUtils;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.vocabulary.RDF;
+import org.locationtech.jts.geom.Envelope;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ *
+ */
+public abstract class GenericPropertyFunction extends PFuncSimple {
+
+ private final GenericFilterFunction filterFunction;
+
+ public GenericPropertyFunction(GenericFilterFunction filterFunction) {
+ this.filterFunction = filterFunction;
+ }
+
+ @Override
+ public QueryIterator execEvaluated(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
+ if (object.isLiteral()) {
+ //These Property Functions do not accept literals as objects so exit quickly.
+ return QueryIterNullIterator.create(execCxt);
+ }
+
+ if (subject.isConcrete() && object.isConcrete()) {
+ //Both are bound.
+ return bothBound(binding, subject, predicate, object, execCxt);
+ } else if (subject.isVariable() && object.isVariable()) {
+ //Both are unbound.
+ return bothUnbound(binding, subject, predicate, object, execCxt);
+ } else {
+ //One bound and one unbound.
+ return oneBound(binding, subject, predicate, object, execCxt);
+ }
+
+ }
+
+ private QueryIterator bothBound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
+
+ Graph graph = execCxt.getActiveGraph();
+ QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.retrieve(execCxt);
+
+ Boolean isPositiveResult = queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
+ if (isPositiveResult) {
+ //Filter function test succeded so retain binding.
+ return QueryIterSingleton.create(binding, execCxt);
+ } else {
+ //Filter function test failed so null result.
+ return QueryIterNullIterator.create(execCxt);
+ }
+
+ }
+
+ private QueryIterator bothUnbound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
+
+ QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
+ Var subjectVar = Var.alloc(subject.getName());
+
+ Graph graph = execCxt.getActiveGraph();
+
+ ExtendedIterator<Triple> subjectTriples;
+ if (graph.contains(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
+ subjectTriples = graph.find(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE);
+ } else {
+ //Check for Geo Predicate Features in the Graph if no GeometryLiterals found.
+ subjectTriples = graph.find(null, SpatialExtension.GEO_LAT_NODE, null);
+
+ }
+
+ //Bind all the Spatial Objects or Geo Predicates once as the subject and search for corresponding Objects.
+ while (subjectTriples.hasNext()) {
+ Triple subjectTriple = subjectTriples.next();
+ Node boundSubject = subjectTriple.getSubject();
+ Binding subjectBind = BindingFactory.binding(binding, subjectVar, boundSubject);
+ QueryIterator queryIter = oneBound(subjectBind, boundSubject, predicate, object, execCxt);
+ queryIterConcat.add(queryIter);
+ }
+
+ return queryIterConcat;
+ }
+
+ private QueryIterator oneBound(Binding binding, Node subject, Node predicate, Node object, ExecutionContext execCxt) {
+
+ Graph graph = execCxt.getActiveGraph();
+ Node boundNode;
+ Node unboundNode;
+ Boolean isSubjectBound;
+ if (subject.isConcrete()) {
+ //Subject is bound, object is unbound.
+ boundNode = subject;
+ unboundNode = object;
+ isSubjectBound = true;
+ } else {
+ //Object is bound, subject is unbound.
+ boundNode = object;
+ unboundNode = subject;
+ isSubjectBound = false;
+ }
+
+ if (!graph.contains(boundNode, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
+ if (!graph.contains(boundNode, SpatialExtension.GEO_LAT_NODE, null)) {
+ //Bound node is not a Feature or a Geometry or has Geo predicates so exit.
+ return QueryIterNullIterator.create(execCxt);
+ }
+ }
+
+ boolean isSpatialIndex = SpatialIndex.isDefined(execCxt);
+ QueryIterConcat queryIterConcat;
+ if (!isSpatialIndex || filterFunction.isDisjoint() || filterFunction.isDisconnected()) {
+ //Disjointed so retrieve all cases.
+ queryIterConcat = findAll(graph, boundNode, unboundNode, binding, isSubjectBound, predicate, execCxt);
+ } else {
+ //Only retrieve those in the spatial index which are within same bounding box.
+ queryIterConcat = findIndex(graph, boundNode, unboundNode, binding, isSubjectBound, predicate, execCxt);
+ }
+
+ return queryIterConcat;
+ }
+
+ private QueryIterConcat findAll(Graph graph, Node boundNode, Node unboundNode, Binding binding, boolean isSubjectBound, Node predicate, ExecutionContext execCxt) {
+
+ //Prepare the results.
+ Var unboundVar = Var.alloc(unboundNode.getName());
+ QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
+
+ //Search for both Features and Geometry in the Graph.
+ ExtendedIterator<Triple> spatialTriples;
+ if (graph.contains(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE)) {
+ spatialTriples = graph.find(null, RDF.type.asNode(), Geo.SPATIAL_OBJECT_NODE);
+ } else {
+ //Check for Geo Predicate Features in the Graph if no GeometryLiterals found.
+ spatialTriples = graph.find(null, SpatialExtension.GEO_LAT_NODE, null);
+ }
+
+ while (spatialTriples.hasNext()) {
+ Triple spatialTriple = spatialTriples.next();
+ Node spatialNode = spatialTriple.getSubject();
+ Binding newBind = BindingFactory.binding(binding, unboundVar, spatialNode);
+ QueryIterator queryIter;
+ if (isSubjectBound) {
+ queryIter = bothBound(newBind, boundNode, predicate, spatialNode, execCxt);
+ } else {
+ queryIter = bothBound(newBind, spatialNode, predicate, boundNode, execCxt);
+ }
+ queryIterConcat.add(queryIter);
+ }
+
+ return queryIterConcat;
+ }
+
+ private QueryIterConcat findIndex(Graph graph, Node boundNode, Node unboundNode, Binding binding, boolean isSubjectBound, Node predicate, ExecutionContext execCxt) throws ExprEvalException {
+
+ try {
+ //Prepare for results.
+ Var unboundVar = Var.alloc(unboundNode.getName());
+ QueryIterConcat queryIterConcat = new QueryIterConcat(execCxt);
+
+ //Find the asserted triples.
+ List<Node> assertedNodes = findAsserted(graph, boundNode, isSubjectBound, predicate);
+ for (Node node : assertedNodes) {
+ Binding newBind = BindingFactory.binding(binding, unboundVar, node);
+ QueryIterator queryIter = QueryIterSingleton.create(newBind, execCxt);
+ queryIterConcat.add(queryIter);
+ }
+
+ //Find the GeometryLiteral of the Bound Node.
+ SpatialObjectGeometryLiteral boundGeometryLiteral = SpatialObjectGeometryLiteral.retrieve(graph, boundNode);
+ if (!boundGeometryLiteral.isValid()) {
+ //Bound Node is not a Feature or a Geometry or there is no GeometryLiteral so exit.
+ return queryIterConcat;
+ }
+
+ Node geometryLiteral = boundGeometryLiteral.getGeometryLiteral();
+
+ //Perform the search of the Spatial Index of the Dataset.
+ SpatialIndex spatialIndex = SpatialIndex.retrieve(execCxt);
+ GeometryWrapper geom = GeometryWrapper.extract(geometryLiteral);
+ GeometryWrapper transformedGeom = geom.transform(spatialIndex.getSrsInfo());
+ Envelope searchEnvelope = transformedGeom.getEnvelope();
+ HashSet<Resource> features = spatialIndex.query(searchEnvelope);
+
+ //Check each of the Features that match the search.
+ for (Resource feature : features) {
+ Node featureNode = feature.asNode();
+
+ //Ensure not already an asserted node.
+ if (!assertedNodes.contains(featureNode)) {
+
+ Binding newBind = BindingFactory.binding(binding, unboundVar, featureNode);
+ QueryIterator queryIter;
+ if (isSubjectBound) {
+ queryIter = bothBound(newBind, boundNode, predicate, featureNode, execCxt);
+ } else {
+ queryIter = bothBound(newBind, featureNode, predicate, boundNode, execCxt);
+ }
+ queryIterConcat.add(queryIter);
+ }
+
+ //Also test all Geometry of the Features. All, some or one Geometry may have matched.
+ ExtendedIterator<Triple> featureGeometryTriples = graph.find(feature.asNode(), Geo.HAS_GEOMETRY_NODE, null);
+ while (featureGeometryTriples.hasNext()) {
+ Triple unboundTriple = featureGeometryTriples.next();
+ Node geomNode = unboundTriple.getObject();
+
+ //Ensure not already an asserted node.
+ if (!assertedNodes.contains(geomNode)) {
+ Binding newBind = BindingFactory.binding(binding, unboundVar, geomNode);
+ QueryIterator queryIter;
+ if (isSubjectBound) {
+ queryIter = bothBound(newBind, boundNode, predicate, geomNode, execCxt);
+ } else {
+ queryIter = bothBound(newBind, geomNode, predicate, boundNode, execCxt);
+ }
+ queryIterConcat.add(queryIter);
+ }
+ }
+ }
+
+ return queryIterConcat;
+ } catch (MismatchedDimensionException | TransformException | FactoryException | SpatialIndexException ex) {
+ throw new ExprEvalException(ex.getMessage() + ": " + FmtUtils.stringForNode(boundNode) + ", " + FmtUtils.stringForNode(unboundNode) + ", " + FmtUtils.stringForNode(predicate), ex);
+ }
+ }
+
+ private List<Node> findAsserted(Graph graph, Node boundNode, boolean isSubjectBound, Node predicate) {
+ List<Node> assertedNodes = new ArrayList<>();
+ if (isSubjectBound) {
+ ExtendedIterator<Triple> assertedTriples = graph.find(boundNode, predicate, null);
+ while (assertedTriples.hasNext()) {
+ Node assertedNode = assertedTriples.next().getObject();
+ assertedNodes.add(assertedNode);
+ }
+ } else {
+ ExtendedIterator<Triple> assertedTriples = graph.find(null, predicate, boundNode);
+ while (assertedTriples.hasNext()) {
+ Node assertedNode = assertedTriples.next().getSubject();
+ assertedNodes.add(assertedNode);
+ }
+ }
+ return assertedNodes;
+ }
+
+ protected final Boolean queryRewrite(Graph graph, Node subject, Node predicate, Node object, QueryRewriteIndex queryRewriteIndex) {
+
+ if (graph.contains(subject, predicate, object)) {
+ //The graph contains the asserted triple, return the current binding.
+ return true;
+ }
+
+ //If query re-writing is disabled then exit - already checked that graph does not contain the asserted relation.
+ if (!queryRewriteIndex.isIndexActive()) {
+ return false;
+ }
+
+ //Begin Query Re-write by finding the literals of the Feature or Geometry.
+ SpatialObjectGeometryLiteral subjectSpatialLiteral = SpatialObjectGeometryLiteral.retrieve(graph, subject);
+ if (!subjectSpatialLiteral.isValid()) {
+ //Subject is not a Feature or a Geometry or there is no GeometryLiteral so exit.
+ return false;
+ }
+
+ SpatialObjectGeometryLiteral objectSpatialLiteral = SpatialObjectGeometryLiteral.retrieve(graph, object);
+ if (!objectSpatialLiteral.isValid()) {
+ //Object is not a Feature or a Geometry or there is no GeometryLiteral so exit.
+ return false;
+ }
+
+ //Check the QueryRewriteIndex for the result.
+ Property predicateProp = ResourceFactory.createProperty(predicate.getURI());
+ Boolean isPositive = queryRewriteIndex.test(subjectSpatialLiteral.getGeometryLiteral(), predicateProp, objectSpatialLiteral.getGeometryLiteral(), this);
+ return isPositive;
+ }
+
+ public Boolean testFilterFunction(Node subjectGeometryLiteral, Node objectGeometryLiteral) {
+ return filterFunction.exec(subjectGeometryLiteral, objectGeometryLiteral);
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
index 80037dd..1e034ef 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/GenericFilterFunction.java
@@ -1,81 +1,81 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological;
-
-import org.apache.jena.datatypes.DatatypeFormatException;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.graph.Node;
-import org.apache.jena.sparql.expr.ExprEvalException;
-import org.apache.jena.sparql.expr.NodeValue;
-import org.apache.jena.sparql.function.FunctionBase2;
-import org.apache.jena.sparql.util.FmtUtils;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public abstract class GenericFilterFunction extends FunctionBase2 {
-
- @Override
- public NodeValue exec(NodeValue v1, NodeValue v2) {
- boolean result = exec(v1.asNode(), v2.asNode());
- return NodeValue.makeBoolean(result);
- }
-
- public Boolean exec(Node v1, Node v2) {
- try {
-
- //Check if the first literal is unparseable or geometry is empty (always fails).
- GeometryWrapper geometry1 = GeometryWrapper.extract(v1, GeometryIndex.PRIMARY);
-
- if (geometry1.isEmpty()) {
- return Boolean.FALSE;
- }
-
- //Check if the second literal is unparseable or geometry is empty (always fails).
- GeometryWrapper geometry2 = GeometryWrapper.extract(v2, GeometryIndex.SECONDARY);
-
- if (geometry2.isEmpty()) {
- return Boolean.FALSE;
- }
-
- if (!permittedTopology(geometry1.getDimensionInfo(), geometry2.getDimensionInfo())) {
- return Boolean.FALSE;
- }
-
- boolean result = relate(geometry1, geometry2);
- return result;
- } catch (DatatypeFormatException | FactoryException | MismatchedDimensionException | TransformException ex) {
- throw new ExprEvalException(ex.getMessage() + ": " + FmtUtils.stringForNode(v1) + ", " + FmtUtils.stringForNode(v2), ex);
- }
- }
-
- protected abstract boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo);
-
- protected abstract boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException;
-
- public abstract boolean isDisjoint();
-
- public abstract boolean isDisconnected();
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological;
+
+import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
+import org.apache.jena.graph.Node;
+import org.apache.jena.sparql.expr.ExprEvalException;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.function.FunctionBase2;
+import org.apache.jena.sparql.util.FmtUtils;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public abstract class GenericFilterFunction extends FunctionBase2 {
+
+ @Override
+ public NodeValue exec(NodeValue v1, NodeValue v2) {
+ boolean result = exec(v1.asNode(), v2.asNode());
+ return NodeValue.makeBoolean(result);
+ }
+
+ public Boolean exec(Node v1, Node v2) {
+ try {
+
+ //Check if the first literal is unparseable or geometry is empty (always fails).
+ GeometryWrapper geometry1 = GeometryWrapper.extract(v1, GeometryIndex.PRIMARY);
+
+ if (geometry1.isEmpty()) {
+ return Boolean.FALSE;
+ }
+
+ //Check if the second literal is unparseable or geometry is empty (always fails).
+ GeometryWrapper geometry2 = GeometryWrapper.extract(v2, GeometryIndex.SECONDARY);
+
+ if (geometry2.isEmpty()) {
+ return Boolean.FALSE;
+ }
+
+ if (!permittedTopology(geometry1.getDimensionInfo(), geometry2.getDimensionInfo())) {
+ return Boolean.FALSE;
+ }
+
+ boolean result = relate(geometry1, geometry2);
+ return result;
+ } catch (DatatypeFormatException | FactoryException | MismatchedDimensionException | TransformException ex) {
+ throw new ExprEvalException(ex.getMessage() + ": " + FmtUtils.stringForNode(v1) + ", " + FmtUtils.stringForNode(v2), ex);
+ }
+ }
+
+ protected abstract boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo);
+
+ protected abstract boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException;
+
+ public abstract boolean isDisjoint();
+
+ public abstract boolean isDisconnected();
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFF.java
index 42373ca..5afe0b1 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFF.java
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhContainsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.CONTAINS);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhContainsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.CONTAINS);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFF.java
index d594aa2..54e7ad0 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhCoveredByFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.COVERED_BY);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhCoveredByFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.COVERED_BY);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFF.java
index 019def5..663ae86 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhCoversFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.COVERS);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isArea() && targetDimensionInfo.isLine()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhCoversFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.COVERS);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isArea() && targetDimensionInfo.isLine()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFF.java
index ec92e30..333b4a3 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhDisjointFF extends GenericFilterFunction {
-
- //Simple Features and Egenhofer disjoint intersection patterns are the same, see GeoSPARQL standard page 11.
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.disjoint(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return true;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhDisjointFF extends GenericFilterFunction {
+
+ //Simple Features and Egenhofer disjoint intersection patterns are the same, see GeoSPARQL standard page 11.
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.disjoint(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return true;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFF.java
index 43acef7..15c5be6 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhEqualsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.EQUALS);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhEqualsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.EQUALS);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFF.java
index 0f89856..228060a 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhInsideFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.INSIDE);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhInsideFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.INSIDE);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFF.java
index 2c59b04..4689975 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhMeetFF extends GenericFilterFunction {
-
- //Simple Features touches and Egenhofer meet intersection patterns are the same, see GeoSPARQL standard page 11.
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.touches(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return !(sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhMeetFF extends GenericFilterFunction {
+
+ //Simple Features touches and Egenhofer meet intersection patterns are the same, see GeoSPARQL standard page 11.
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.touches(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return !(sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFF.java
index bcb1b7a..5568276 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class EhOverlapFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.OVERLAP);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.egenhofer;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.EgenhoferIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class EhOverlapFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, EgenhoferIntersectionPattern.OVERLAP);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFF.java
index de6419e..ccb15d7 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccDisconnectedFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.DISCONNECTED);
- }
-
- @Override
- public boolean isDisjoint() {
- return true;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return true;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccDisconnectedFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.DISCONNECTED);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return true;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return true;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFF.java
index 4cc7565..34a62a9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccEqualsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.EQUALS);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccEqualsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.EQUALS);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFF.java
index 4763dc3..99275d4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccExternallyConnectedFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.EXTERNALLY_CONNECTED);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccExternallyConnectedFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.EXTERNALLY_CONNECTED);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFF.java
index 987fe1b..e78f3b9 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccNonTangentialProperPartFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.NON_TANGENTIAL_PROPER_PART);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccNonTangentialProperPartFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.NON_TANGENTIAL_PROPER_PART);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFF.java
index 70cac9a..0b90971 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccNonTangentialProperPartInverseFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.NON_TANGENTIAL_PROPER_PART_INVERSE);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccNonTangentialProperPartInverseFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.NON_TANGENTIAL_PROPER_PART_INVERSE);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFF.java
index 1f65dd9..5ec268d 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFF.java
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccPartiallyOverlappingFF extends GenericFilterFunction {
-
- //Simple Features overlaps and RCC8 partially overlapping intersection patterns are the same, see GeoSPARQL standard page 11.
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.PARTIALLY_OVERLAPPING);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccPartiallyOverlappingFF extends GenericFilterFunction {
+
+ //Simple Features overlaps and RCC8 partially overlapping intersection patterns are the same, see GeoSPARQL standard page 11.
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.PARTIALLY_OVERLAPPING);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFF.java
index e012c1e..0d540c2 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccTangentialProperPartFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.TANGENTIAL_PROPER_PART);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccTangentialProperPartFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.TANGENTIAL_PROPER_PART);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFF.java
index f331abf..3cb849f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class RccTangentialProperPartInverseFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.TANGENTIAL_PROPER_PART_INVERSE);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.rcc8;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.RCC8IntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class RccTangentialProperPartInverseFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, RCC8IntersectionPattern.TANGENTIAL_PROPER_PART_INVERSE);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return sourceDimensionInfo.isArea() && targetDimensionInfo.isArea();
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFF.java
index 4caee05..faff8dc 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFF.java
@@ -1,53 +1,53 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfContainsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.contains(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfContainsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.contains(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFF.java
index bdb86d2..ec86d18 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfCrossesFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.crosses(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return (sourceDimensionInfo.isPoint() && targetDimensionInfo.isLine()) || (sourceDimensionInfo.isPoint() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfCrossesFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.crosses(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return (sourceDimensionInfo.isPoint() && targetDimensionInfo.isLine()) || (sourceDimensionInfo.isPoint() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFF.java
index ee788aa..588fd33 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfDisjointFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.disjoint(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return true;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfDisjointFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.disjoint(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return true;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFF.java
index 842e95a..fe11f90 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFF.java
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.intersection_patterns.SimpleFeaturesIntersectionPattern;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfEqualsFF extends GenericFilterFunction {
-
- //SimmpleFeatures equals patterns differs from those stated in JTS equals, see GeoSPARQL standard page 8.
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.relate(targetGeometry, SimpleFeaturesIntersectionPattern.EQUALS);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.intersection_patterns.SimpleFeaturesIntersectionPattern;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfEqualsFF extends GenericFilterFunction {
+
+ //SimmpleFeatures equals patterns differs from those stated in JTS equals, see GeoSPARQL standard page 8.
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.relate(targetGeometry, SimpleFeaturesIntersectionPattern.EQUALS);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFF.java
index 75fdaad..6afccca 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfIntersectsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.intersects(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfIntersectsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.intersects(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFF.java
index a33e9ca..7872bb4 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfOverlapsFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.overlaps(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfOverlapsFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.overlaps(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return (sourceDimensionInfo.isArea() && targetDimensionInfo.isArea()) || (sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint()) || (sourceDimensionInfo.isLine() && targetDimensionInfo.isLine());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFF.java
index 1470b32..5f14210 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfTouchesFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.touches(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return !(sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint());
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfTouchesFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.touches(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return !(sourceDimensionInfo.isPoint() && targetDimensionInfo.isPoint());
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFF.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFF.java
index e0b996c..a50822e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFF.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFF.java
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
-
-import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class SfWithinFF extends GenericFilterFunction {
-
- @Override
- protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return sourceGeometry.within(targetGeometry);
- }
-
- @Override
- public boolean isDisjoint() {
- return false;
- }
-
- @Override
- protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
- return true;
- }
-
- @Override
- public boolean isDisconnected() {
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.geof.topological.filter_functions.simple_features;
+
+import org.apache.jena.geosparql.geof.topological.GenericFilterFunction;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class SfWithinFF extends GenericFilterFunction {
+
+ @Override
+ protected boolean relate(GeometryWrapper sourceGeometry, GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return sourceGeometry.within(targetGeometry);
+ }
+
+ @Override
+ public boolean isDisjoint() {
+ return false;
+ }
+
+ @Override
+ protected boolean permittedTopology(DimensionInfo sourceDimensionInfo, DimensionInfo targetDimensionInfo) {
+ return true;
+ }
+
+ @Override
+ public boolean isDisconnected() {
+ return false;
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
index cd9f1bd..6850974 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/DimensionInfo.java
@@ -1,216 +1,216 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
-import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.CoordinateXY;
-import org.locationtech.jts.geom.Geometry;
-
-/**
- *
- *
- */
-public class DimensionInfo implements Serializable {
-
- private final int coordinate;
- private final int spatial;
- private final int topological;
- private final CoordinateSequenceDimensions coordinateSequenceDimensions;
-
- private final boolean isPoint;
- private final boolean isLine;
- private final boolean isArea;
-
- public DimensionInfo(CoordinateSequenceDimensions coordinateSequenceDimensions, int topological) {
- this.coordinateSequenceDimensions = coordinateSequenceDimensions;
- this.topological = topological;
- this.coordinate = findCoordinateDimension(coordinateSequenceDimensions);
- this.spatial = findSpatialDimension(coordinateSequenceDimensions);
- this.isPoint = topological == 0;
- this.isLine = topological == 1;
- this.isArea = topological == 2;
- }
-
- public DimensionInfo(int coordinate, int spatial, int topological) {
- this.coordinate = coordinate;
- this.spatial = spatial;
- this.topological = topological;
- this.coordinateSequenceDimensions = findCoordinateSequenceDimensions(coordinate, spatial);
- this.isPoint = topological == 0;
- this.isLine = topological == 1;
- this.isArea = topological == 2;
- }
-
- public static int findSpatialDimension(CoordinateSequenceDimensions dims) {
-
- switch (dims) {
- case XYZ:
- case XYZM:
- return 3;
- default:
- return 2;
- }
- }
-
- public static int findCoordinateDimension(CoordinateSequenceDimensions dims) {
- switch (dims) {
- case XYZ:
- case XYM:
- return 3;
- case XYZM:
- return 4;
- default:
- return 2;
- }
- }
-
- public static DimensionInfo find(Coordinate coordinate, Geometry geometry) {
- CoordinateSequenceDimensions coordDims = CoordinateSequenceDimensions.find(coordinate);
- return new DimensionInfo(coordDims, geometry.getDimension());
- }
-
- private static final Coordinate XY_COORDINATE = new CoordinateXY(0, 0);
-
- public static DimensionInfo find(Coordinate[] coordinates, Geometry geometry) {
- Coordinate coordinate;
- if (coordinates.length == 0) {
- coordinate = XY_COORDINATE;
- } else {
- coordinate = coordinates[0];
- }
- return find(coordinate, geometry);
- }
-
- public static DimensionInfo find(List<Coordinate> coordinates, Geometry geometry) {
- Coordinate coordinate;
- if (coordinates.isEmpty()) {
- coordinate = XY_COORDINATE;
- } else {
- coordinate = coordinates.get(0);
- }
- return find(coordinate, geometry);
- }
-
- public static DimensionInfo findCollection(List<? extends Geometry> geometries, Geometry geometry) {
- Coordinate coordinate;
- if (geometries.isEmpty()) {
- coordinate = XY_COORDINATE;
- } else {
- Geometry geom = geometries.get(0);
- coordinate = geom.getCoordinate();
- }
- return find(coordinate, geometry);
- }
-
- public int getCoordinate() {
- return coordinate;
- }
-
- public int getSpatial() {
- return spatial;
- }
-
- public int getTopological() {
- return topological;
- }
-
- public boolean isPoint() {
- return isPoint;
- }
-
- public boolean isLine() {
- return isLine;
- }
-
- public boolean isArea() {
- return isArea;
- }
-
- public CoordinateSequenceDimensions getDimensions() {
- return coordinateSequenceDimensions;
- }
-
- @Override
- public int hashCode() {
- int hash = 7;
- hash = 53 * hash + this.coordinate;
- hash = 53 * hash + this.spatial;
- hash = 53 * hash + this.topological;
- hash = 53 * hash + Objects.hashCode(this.coordinateSequenceDimensions);
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final DimensionInfo other = (DimensionInfo) obj;
- if (this.coordinate != other.coordinate) {
- return false;
- }
- if (this.spatial != other.spatial) {
- return false;
- }
- if (this.topological != other.topological) {
- return false;
- }
- return this.coordinateSequenceDimensions == other.coordinateSequenceDimensions;
- }
-
- @Override
- public String toString() {
- return "DimensionInfo{" + "coordinate=" + coordinate + ", spatial=" + spatial + ", topological=" + topological + ", coordinateSequenceDimensions=" + coordinateSequenceDimensions + ", isPoint=" + isPoint + ", isLine=" + isLine + ", isArea=" + isArea + '}';
- }
-
- public static DimensionInfo XY_POINT = new DimensionInfo(2, 2, 0);
-
- public static DimensionInfo XYZ_POINT = new DimensionInfo(3, 3, 0);
-
- public static DimensionInfo XYM_POINT = new DimensionInfo(3, 2, 0);
-
- public static DimensionInfo XYZM_POINT = new DimensionInfo(4, 3, 0);
-
- public static DimensionInfo XY_LINESTRING = new DimensionInfo(2, 2, 1);
-
- public static DimensionInfo XYZ_LINESTRING = new DimensionInfo(3, 3, 1);
-
- public static DimensionInfo XYM_LINESTRING = new DimensionInfo(3, 2, 1);
-
- public static DimensionInfo XYZM_LINESTRING = new DimensionInfo(4, 3, 1);
-
- public static DimensionInfo XY_POLYGON = new DimensionInfo(2, 2, 2);
-
- public static DimensionInfo XYZ_POLYGON = new DimensionInfo(3, 3, 2);
-
- public static DimensionInfo XYM_POLYGON = new DimensionInfo(3, 2, 2);
-
- public static DimensionInfo XYZM_POLYGON = new DimensionInfo(4, 3, 2);
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
+import static org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence.findCoordinateSequenceDimensions;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateXY;
+import org.locationtech.jts.geom.Geometry;
+
+/**
+ *
+ *
+ */
+public class DimensionInfo implements Serializable {
+
+ private final int coordinate;
+ private final int spatial;
+ private final int topological;
+ private final CoordinateSequenceDimensions coordinateSequenceDimensions;
+
+ private final boolean isPoint;
+ private final boolean isLine;
+ private final boolean isArea;
+
+ public DimensionInfo(CoordinateSequenceDimensions coordinateSequenceDimensions, int topological) {
+ this.coordinateSequenceDimensions = coordinateSequenceDimensions;
+ this.topological = topological;
+ this.coordinate = findCoordinateDimension(coordinateSequenceDimensions);
+ this.spatial = findSpatialDimension(coordinateSequenceDimensions);
+ this.isPoint = topological == 0;
+ this.isLine = topological == 1;
+ this.isArea = topological == 2;
+ }
+
+ public DimensionInfo(int coordinate, int spatial, int topological) {
+ this.coordinate = coordinate;
+ this.spatial = spatial;
+ this.topological = topological;
+ this.coordinateSequenceDimensions = findCoordinateSequenceDimensions(coordinate, spatial);
+ this.isPoint = topological == 0;
+ this.isLine = topological == 1;
+ this.isArea = topological == 2;
+ }
+
+ public static int findSpatialDimension(CoordinateSequenceDimensions dims) {
+
+ switch (dims) {
+ case XYZ:
+ case XYZM:
+ return 3;
+ default:
+ return 2;
+ }
+ }
+
+ public static int findCoordinateDimension(CoordinateSequenceDimensions dims) {
+ switch (dims) {
+ case XYZ:
+ case XYM:
+ return 3;
+ case XYZM:
+ return 4;
+ default:
+ return 2;
+ }
+ }
+
+ public static DimensionInfo find(Coordinate coordinate, Geometry geometry) {
+ CoordinateSequenceDimensions coordDims = CoordinateSequenceDimensions.find(coordinate);
+ return new DimensionInfo(coordDims, geometry.getDimension());
+ }
+
+ private static final Coordinate XY_COORDINATE = new CoordinateXY(0, 0);
+
+ public static DimensionInfo find(Coordinate[] coordinates, Geometry geometry) {
+ Coordinate coordinate;
+ if (coordinates.length == 0) {
+ coordinate = XY_COORDINATE;
+ } else {
+ coordinate = coordinates[0];
+ }
+ return find(coordinate, geometry);
+ }
+
+ public static DimensionInfo find(List<Coordinate> coordinates, Geometry geometry) {
+ Coordinate coordinate;
+ if (coordinates.isEmpty()) {
+ coordinate = XY_COORDINATE;
+ } else {
+ coordinate = coordinates.get(0);
+ }
+ return find(coordinate, geometry);
+ }
+
+ public static DimensionInfo findCollection(List<? extends Geometry> geometries, Geometry geometry) {
+ Coordinate coordinate;
+ if (geometries.isEmpty()) {
+ coordinate = XY_COORDINATE;
+ } else {
+ Geometry geom = geometries.get(0);
+ coordinate = geom.getCoordinate();
+ }
+ return find(coordinate, geometry);
+ }
+
+ public int getCoordinate() {
+ return coordinate;
+ }
+
+ public int getSpatial() {
+ return spatial;
+ }
+
+ public int getTopological() {
+ return topological;
+ }
+
+ public boolean isPoint() {
+ return isPoint;
+ }
+
+ public boolean isLine() {
+ return isLine;
+ }
+
+ public boolean isArea() {
+ return isArea;
+ }
+
+ public CoordinateSequenceDimensions getDimensions() {
+ return coordinateSequenceDimensions;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 53 * hash + this.coordinate;
+ hash = 53 * hash + this.spatial;
+ hash = 53 * hash + this.topological;
+ hash = 53 * hash + Objects.hashCode(this.coordinateSequenceDimensions);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final DimensionInfo other = (DimensionInfo) obj;
+ if (this.coordinate != other.coordinate) {
+ return false;
+ }
+ if (this.spatial != other.spatial) {
+ return false;
+ }
+ if (this.topological != other.topological) {
+ return false;
+ }
+ return this.coordinateSequenceDimensions == other.coordinateSequenceDimensions;
+ }
+
+ @Override
+ public String toString() {
+ return "DimensionInfo{" + "coordinate=" + coordinate + ", spatial=" + spatial + ", topological=" + topological + ", coordinateSequenceDimensions=" + coordinateSequenceDimensions + ", isPoint=" + isPoint + ", isLine=" + isLine + ", isArea=" + isArea + '}';
+ }
+
+ public static DimensionInfo XY_POINT = new DimensionInfo(2, 2, 0);
+
+ public static DimensionInfo XYZ_POINT = new DimensionInfo(3, 3, 0);
+
+ public static DimensionInfo XYM_POINT = new DimensionInfo(3, 2, 0);
+
+ public static DimensionInfo XYZM_POINT = new DimensionInfo(4, 3, 0);
+
+ public static DimensionInfo XY_LINESTRING = new DimensionInfo(2, 2, 1);
+
+ public static DimensionInfo XYZ_LINESTRING = new DimensionInfo(3, 3, 1);
+
+ public static DimensionInfo XYM_LINESTRING = new DimensionInfo(3, 2, 1);
+
+ public static DimensionInfo XYZM_LINESTRING = new DimensionInfo(4, 3, 1);
+
+ public static DimensionInfo XY_POLYGON = new DimensionInfo(2, 2, 2);
+
+ public static DimensionInfo XYZ_POLYGON = new DimensionInfo(3, 3, 2);
+
+ public static DimensionInfo XYM_POLYGON = new DimensionInfo(3, 2, 2);
+
+ public static DimensionInfo XYZM_POLYGON = new DimensionInfo(4, 3, 2);
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryReverse.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryReverse.java
index af037ac..597221e 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryReverse.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryReverse.java
@@ -1,226 +1,226 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation;
-
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-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.Polygon;
-
-/**
- *
- *
- */
-public class GeometryReverse {
-
- /**
- * Checks the spatial reference system URI for y,x and reverses the supplied
- * geometry coordinates.
- *
- * @param geometry
- * @param srsURI
- * @return Geometry in x,y coordinate order.
- */
- public static final Geometry check(Geometry geometry, String srsURI) {
-
- Boolean isAxisXY = SRSRegistry.getAxisXY(srsURI);
- return check(geometry, isAxisXY);
- }
-
- /**
- * Checks the spatial reference system URI for y,x and reverses the supplied
- * geometry coordinates.
- *
- * @param geometry
- * @param srsInfo
- * @return Geometry in x,y coordinate order.
- */
- public static final Geometry check(Geometry geometry, SRSInfo srsInfo) {
- return check(geometry, srsInfo.isAxisXY());
- }
-
- /**
- * Checks the spatial reference system URI for y,x and reverses the supplied
- * geometry coordinates.
- *
- * @param geometry
- * @param isAxisXY
- * @return Geometry in x,y coordinate order.
- */
- public static final Geometry check(Geometry geometry, Boolean isAxisXY) {
-
- Geometry finalGeometry;
- if (isAxisXY) {
- finalGeometry = geometry;
- } else {
- finalGeometry = reverseGeometry(geometry);
- }
- return finalGeometry;
- }
-
- /**
- * Reverses coordinate order of the supplied geometry and produces a new
- * geometry.
- *
- * @param geometry
- * @return Geometry in x,y coordinate order.
- */
- public static Geometry reverseGeometry(Geometry geometry) {
-
- if (geometry.isEmpty()) {
- return geometry.copy();
- }
-
- GeometryFactory factory = geometry.getFactory();
- Geometry finalGeometry;
- Coordinate[] coordinates;
-
- String type = geometry.getGeometryType();
-
- switch (type) {
- case "LineString":
- coordinates = getReversedCoordinates(geometry);
- finalGeometry = factory.createLineString(coordinates);
- break;
- case "LinearRing":
- coordinates = getReversedCoordinates(geometry);
- finalGeometry = factory.createLinearRing(coordinates);
- break;
- case "MultiPoint":
- coordinates = getReversedCoordinates(geometry);
- finalGeometry = factory.createMultiPointFromCoords(coordinates);
- break;
- case "Polygon":
- finalGeometry = reversePolygon(geometry, factory);
- break;
- case "Point":
- coordinates = getReversedCoordinates(geometry);
- finalGeometry = factory.createPoint(coordinates[0]);
- break;
- case "MultiPolygon":
- Polygon[] polygons = unpackPolygons((GeometryCollection) geometry);
- finalGeometry = factory.createMultiPolygon(polygons);
- break;
- case "MultiLineString":
- LineString[] lineString = unpackLineStrings((GeometryCollection) geometry);
- finalGeometry = factory.createMultiLineString(lineString);
- break;
- case "GeometryCollection":
- Geometry[] geometries = unpackGeometryCollection((GeometryCollection) geometry);
- finalGeometry = factory.createGeometryCollection(geometries);
- break;
- default:
- finalGeometry = geometry;
- break;
- }
-
- return finalGeometry;
- }
-
- private static Coordinate[] getReversedCoordinates(Geometry geometry) {
-
- Coordinate[] original = geometry.getCoordinates();
- Coordinate[] reversed = new Coordinate[original.length];
-
- for (int i = 0; i < original.length; i++) {
- reversed[i] = new Coordinate(original[i].y, original[i].x);
- }
-
- return reversed;
-
- }
-
- private static Polygon reversePolygon(Geometry geometry, GeometryFactory factory) {
-
- Polygon finalGeometry;
- Polygon polygon = (Polygon) geometry;
- if (polygon.getNumInteriorRing() == 0) {
- //There are no interior rings so perform the standard reversal.
- Coordinate[] coordinates = getReversedCoordinates(geometry);
- finalGeometry = factory.createPolygon(coordinates);
- } else {
-
- LineString exteriorRing = polygon.getExteriorRing();
- Coordinate[] reversedExteriorCoordinates = getReversedCoordinates(exteriorRing);
- LinearRing reversedExteriorRing = factory.createLinearRing(reversedExteriorCoordinates);
-
- LinearRing[] reversedInteriorRings = new LinearRing[polygon.getNumInteriorRing()];
- for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
- LineString interiorRing = polygon.getInteriorRingN(i);
- Coordinate[] reversedInteriorCoordinates = getReversedCoordinates(interiorRing);
- LinearRing reversedInteriorRing = factory.createLinearRing(reversedInteriorCoordinates);
- reversedInteriorRings[i] = reversedInteriorRing;
- }
-
- finalGeometry = factory.createPolygon(reversedExteriorRing, reversedInteriorRings);
- }
-
- return finalGeometry;
- }
-
- private static Polygon[] unpackPolygons(GeometryCollection geoCollection) {
-
- GeometryFactory factory = geoCollection.getFactory();
-
- int count = geoCollection.getNumGeometries();
- Polygon[] polygons = new Polygon[count];
-
- for (int i = 0; i < count; i++) {
- Geometry geometry = geoCollection.getGeometryN(i);
- Polygon polygon = reversePolygon(geometry, factory);
- polygons[i] = polygon;
- }
-
- return polygons;
- }
-
- private static LineString[] unpackLineStrings(GeometryCollection geoCollection) {
-
- GeometryFactory factory = geoCollection.getFactory();
-
- int count = geoCollection.getNumGeometries();
- LineString[] lineStrings = new LineString[count];
-
- for (int i = 0; i < count; i++) {
- Geometry geometry = geoCollection.getGeometryN(i);
- Coordinate[] coordinates = getReversedCoordinates(geometry);
- LineString lineString = factory.createLineString(coordinates);
- lineStrings[i] = lineString;
- }
-
- return lineStrings;
- }
-
- private static Geometry[] unpackGeometryCollection(GeometryCollection geoCollection) {
-
- int count = geoCollection.getNumGeometries();
- Geometry[] geometries = new Geometry[count];
-
- for (int i = 0; i < count; i++) {
- Geometry geometry = geoCollection.getGeometryN(i);
- geometries[i] = reverseGeometry(geometry);
- }
-
- return geometries;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation;
+
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+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.Polygon;
+
+/**
+ *
+ *
+ */
+public class GeometryReverse {
+
+ /**
+ * Checks the spatial reference system URI for y,x and reverses the supplied
+ * geometry coordinates.
+ *
+ * @param geometry
+ * @param srsURI
+ * @return Geometry in x,y coordinate order.
+ */
+ public static final Geometry check(Geometry geometry, String srsURI) {
+
+ Boolean isAxisXY = SRSRegistry.getAxisXY(srsURI);
+ return check(geometry, isAxisXY);
+ }
+
+ /**
+ * Checks the spatial reference system URI for y,x and reverses the supplied
+ * geometry coordinates.
+ *
+ * @param geometry
+ * @param srsInfo
+ * @return Geometry in x,y coordinate order.
+ */
+ public static final Geometry check(Geometry geometry, SRSInfo srsInfo) {
+ return check(geometry, srsInfo.isAxisXY());
+ }
+
+ /**
+ * Checks the spatial reference system URI for y,x and reverses the supplied
+ * geometry coordinates.
+ *
+ * @param geometry
+ * @param isAxisXY
+ * @return Geometry in x,y coordinate order.
+ */
+ public static final Geometry check(Geometry geometry, Boolean isAxisXY) {
+
+ Geometry finalGeometry;
+ if (isAxisXY) {
+ finalGeometry = geometry;
+ } else {
+ finalGeometry = reverseGeometry(geometry);
+ }
+ return finalGeometry;
+ }
+
+ /**
+ * Reverses coordinate order of the supplied geometry and produces a new
+ * geometry.
+ *
+ * @param geometry
+ * @return Geometry in x,y coordinate order.
+ */
+ public static Geometry reverseGeometry(Geometry geometry) {
+
+ if (geometry.isEmpty()) {
+ return geometry.copy();
+ }
+
+ GeometryFactory factory = geometry.getFactory();
+ Geometry finalGeometry;
+ Coordinate[] coordinates;
+
+ String type = geometry.getGeometryType();
+
+ switch (type) {
+ case "LineString":
+ coordinates = getReversedCoordinates(geometry);
+ finalGeometry = factory.createLineString(coordinates);
+ break;
+ case "LinearRing":
+ coordinates = getReversedCoordinates(geometry);
+ finalGeometry = factory.createLinearRing(coordinates);
+ break;
+ case "MultiPoint":
+ coordinates = getReversedCoordinates(geometry);
+ finalGeometry = factory.createMultiPointFromCoords(coordinates);
+ break;
+ case "Polygon":
+ finalGeometry = reversePolygon(geometry, factory);
+ break;
+ case "Point":
+ coordinates = getReversedCoordinates(geometry);
+ finalGeometry = factory.createPoint(coordinates[0]);
+ break;
+ case "MultiPolygon":
+ Polygon[] polygons = unpackPolygons((GeometryCollection) geometry);
+ finalGeometry = factory.createMultiPolygon(polygons);
+ break;
+ case "MultiLineString":
+ LineString[] lineString = unpackLineStrings((GeometryCollection) geometry);
+ finalGeometry = factory.createMultiLineString(lineString);
+ break;
+ case "GeometryCollection":
+ Geometry[] geometries = unpackGeometryCollection((GeometryCollection) geometry);
+ finalGeometry = factory.createGeometryCollection(geometries);
+ break;
+ default:
+ finalGeometry = geometry;
+ break;
+ }
+
+ return finalGeometry;
+ }
+
+ private static Coordinate[] getReversedCoordinates(Geometry geometry) {
+
+ Coordinate[] original = geometry.getCoordinates();
+ Coordinate[] reversed = new Coordinate[original.length];
+
+ for (int i = 0; i < original.length; i++) {
+ reversed[i] = new Coordinate(original[i].y, original[i].x);
+ }
+
+ return reversed;
+
+ }
+
+ private static Polygon reversePolygon(Geometry geometry, GeometryFactory factory) {
+
+ Polygon finalGeometry;
+ Polygon polygon = (Polygon) geometry;
+ if (polygon.getNumInteriorRing() == 0) {
+ //There are no interior rings so perform the standard reversal.
+ Coordinate[] coordinates = getReversedCoordinates(geometry);
+ finalGeometry = factory.createPolygon(coordinates);
+ } else {
+
+ LineString exteriorRing = polygon.getExteriorRing();
+ Coordinate[] reversedExteriorCoordinates = getReversedCoordinates(exteriorRing);
+ LinearRing reversedExteriorRing = factory.createLinearRing(reversedExteriorCoordinates);
+
+ LinearRing[] reversedInteriorRings = new LinearRing[polygon.getNumInteriorRing()];
+ for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
+ LineString interiorRing = polygon.getInteriorRingN(i);
+ Coordinate[] reversedInteriorCoordinates = getReversedCoordinates(interiorRing);
+ LinearRing reversedInteriorRing = factory.createLinearRing(reversedInteriorCoordinates);
+ reversedInteriorRings[i] = reversedInteriorRing;
+ }
+
+ finalGeometry = factory.createPolygon(reversedExteriorRing, reversedInteriorRings);
+ }
+
+ return finalGeometry;
+ }
+
+ private static Polygon[] unpackPolygons(GeometryCollection geoCollection) {
+
+ GeometryFactory factory = geoCollection.getFactory();
+
+ int count = geoCollection.getNumGeometries();
+ Polygon[] polygons = new Polygon[count];
+
+ for (int i = 0; i < count; i++) {
+ Geometry geometry = geoCollection.getGeometryN(i);
+ Polygon polygon = reversePolygon(geometry, factory);
+ polygons[i] = polygon;
+ }
+
+ return polygons;
+ }
+
+ private static LineString[] unpackLineStrings(GeometryCollection geoCollection) {
+
+ GeometryFactory factory = geoCollection.getFactory();
+
+ int count = geoCollection.getNumGeometries();
+ LineString[] lineStrings = new LineString[count];
+
+ for (int i = 0; i < count; i++) {
+ Geometry geometry = geoCollection.getGeometryN(i);
+ Coordinate[] coordinates = getReversedCoordinates(geometry);
+ LineString lineString = factory.createLineString(coordinates);
+ lineStrings[i] = lineString;
+ }
+
+ return lineStrings;
+ }
+
+ private static Geometry[] unpackGeometryCollection(GeometryCollection geoCollection) {
+
+ int count = geoCollection.getNumGeometries();
+ Geometry[] geometries = new Geometry[count];
+
+ for (int i = 0; i < count; i++) {
+ Geometry geometry = geoCollection.getGeometryN(i);
+ geometries[i] = reverseGeometry(geometry);
+ }
+
+ return geometries;
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
index 8e97818..d8456ec 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/GeometryWrapper.java
@@ -1,1248 +1,1248 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.apache.jena.datatypes.DatatypeFormatException;
-import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
-import org.apache.jena.geosparql.implementation.great_circle.CoordinatePair;
-import org.apache.jena.geosparql.implementation.great_circle.GreatCircleDistance;
-import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
-import org.apache.jena.geosparql.implementation.index.GeometryTransformIndex;
-import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
-import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
-import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
-import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
-import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.jena.graph.Node;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.sparql.expr.NodeValue;
-import org.apache.sis.geometry.DirectPosition2D;
-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.IntersectionMatrix;
-import org.locationtech.jts.geom.Point;
-import org.locationtech.jts.geom.prep.PreparedGeometry;
-import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
-import org.locationtech.jts.geom.util.AffineTransformation;
-import org.opengis.geometry.DirectPosition;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class GeometryWrapper implements Serializable {
-
- private final DimensionInfo dimensionInfo;
- private final SRSInfo srsInfo;
- private final Geometry xyGeometry;
- private final Geometry parsingGeometry;
- private PreparedGeometry preparedGeometry;
- private Envelope envelope;
- private Geometry translateXYGeometry;
- private final String geometryDatatypeURI;
- private GeometryDatatype geometryDatatype;
- private String lexicalForm;
- private String utmURI = null;
- private Double latitude = null;
-
- /**
- *
- * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
- * @param srsURI
- * @param geometryDatatypeURI
- * @param dimensionInfo
- */
- public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo) {
- this(geometry, srsURI, geometryDatatypeURI, dimensionInfo, null);
- }
-
- /**
- *
- * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
- * @param srsURI
- * @param geometryDatatypeURI
- * @param dimensionInfo
- * @param geometryLiteral
- */
- public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo, String geometryLiteral) {
- this(geometry, GeometryReverse.check(geometry, srsURI.isEmpty() ? SRS_URI.DEFAULT_WKT_CRS84 : srsURI), srsURI.isEmpty() ? SRS_URI.DEFAULT_WKT_CRS84 : srsURI, geometryDatatypeURI, dimensionInfo, geometryLiteral);
- }
-
- protected GeometryWrapper(Geometry parsingGeometry, Geometry xyGeometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo) {
- this(parsingGeometry, xyGeometry, srsURI, geometryDatatypeURI, dimensionInfo, null);
- }
-
- protected GeometryWrapper(Geometry parsingGeometry, Geometry xyGeometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo, String lexicalForm) {
-
- this.parsingGeometry = parsingGeometry;
- this.xyGeometry = xyGeometry;
- this.preparedGeometry = null; //Initialised when required by spatial relations checkPreparedGeometry.
- this.envelope = null; //Initialised when required by getEnvelope().
- this.translateXYGeometry = null; //Initialised when required by translateGeometry().
- this.geometryDatatypeURI = geometryDatatypeURI;
- this.geometryDatatype = null; //Inilialised when required by getGeometryDatatype().
-
- if (srsURI.isEmpty()) {
- srsURI = SRS_URI.DEFAULT_WKT_CRS84;
- }
-
- this.srsInfo = SRSRegistry.getSRSInfo(srsURI);
-
- this.dimensionInfo = dimensionInfo;
- this.lexicalForm = lexicalForm; //If not Initialised then required by asLiteral() etc.
- }
-
- /**
- * Default to WGS84 geometry and XY coordinate dimensions.
- *
- * @param geometry In X/Y or Y/X coordinate order of WGS84.
- * @param geometryDatatypeURI
- */
- public GeometryWrapper(Geometry geometry, String geometryDatatypeURI) {
- this(geometry, "", geometryDatatypeURI, DimensionInfo.XY_POINT);
- }
-
- /**
- * Default to XY coordinate dimensions.
- *
- * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
- * @param srsURI
- * @param geometryDatatypeURI
- */
- public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI) {
- this(geometry, srsURI, geometryDatatypeURI, DimensionInfo.XY_POINT);
- }
-
- /**
- * Empty geometry with specified parameters.
- *
- * @param srsURI
- * @param geometryDatatypeURI
- */
- public GeometryWrapper(String srsURI, String geometryDatatypeURI) {
- this(new CustomCoordinateSequence(DimensionInfo.XY_POINT.getDimensions()), geometryDatatypeURI, srsURI);
- }
-
- /**
- * Point geometry with specified SRS.
- *
- * @param pointCoordinateSequence
- * @param geometryDatatypeURI
- * @param srsURI
- */
- public GeometryWrapper(CustomCoordinateSequence pointCoordinateSequence, String geometryDatatypeURI, String srsURI) {
- this(CustomGeometryFactory.theInstance().createPoint(pointCoordinateSequence), srsURI, geometryDatatypeURI, DimensionInfo.XY_POINT);
- }
-
- /**
- * Copy GeometryWrapper.
- *
- * @param geometryWrapper
- */
- public GeometryWrapper(GeometryWrapper geometryWrapper) {
-
- this.xyGeometry = geometryWrapper.xyGeometry;
- this.parsingGeometry = geometryWrapper.parsingGeometry;
- this.preparedGeometry = geometryWrapper.preparedGeometry;
- this.envelope = geometryWrapper.envelope;
- this.translateXYGeometry = geometryWrapper.translateXYGeometry;
- this.utmURI = geometryWrapper.utmURI;
- this.latitude = geometryWrapper.latitude;
- this.geometryDatatypeURI = geometryWrapper.geometryDatatypeURI;
- this.geometryDatatype = geometryWrapper.geometryDatatype;
-
- this.srsInfo = geometryWrapper.srsInfo;
- this.dimensionInfo = geometryWrapper.dimensionInfo;
- this.lexicalForm = geometryWrapper.lexicalForm;
- }
-
- /**
- * Transforms, if necessary, the provided target GeometryWrapper according
- * to this GeometryWrapper SRS_URI.
- *
- * @param targetGeometryWrapper
- * @return GeometryWrapper after transformation.
- * @throws FactoryException
- * @throws MismatchedDimensionException
- * @throws TransformException
- */
- public GeometryWrapper checkTransformSRS(GeometryWrapper targetGeometryWrapper) throws FactoryException, MismatchedDimensionException, TransformException {
-
- GeometryWrapper transformedGeometryWrapper;
- String srsURI = srsInfo.getSrsURI();
- if (srsURI.equals(targetGeometryWrapper.srsInfo.getSrsURI())) {
- transformedGeometryWrapper = targetGeometryWrapper;
- } else {
- transformedGeometryWrapper = targetGeometryWrapper.transform(srsURI);
- }
-
- return transformedGeometryWrapper;
- }
-
- /**
- * Transform the GeometryWrapper into another spatial reference system.<br>
- *
- * @param srsURI
- * @return New GeometryWrapper after transformation, or this GeometryWrapper
- * if no transformation.
- * @throws MismatchedDimensionException
- * @throws TransformException
- * @throws FactoryException
- */
- public GeometryWrapper transform(String srsURI) throws MismatchedDimensionException, TransformException, FactoryException {
- return transform(srsURI, true);
- }
-
- /**
- * Transform the GeometryWrapper into another spatial reference system.<br>
- *
- * @param srsInfo
- * @return New GeometryWrapper after transformation, or this GeometryWrapper
- * if no transformation.
- * @throws MismatchedDimensionException
- * @throws TransformException
- * @throws FactoryException
- */
- public GeometryWrapper transform(SRSInfo srsInfo) throws MismatchedDimensionException, TransformException, FactoryException {
- return transform(srsInfo.getSrsURI(), true);
- }
-
- /**
- * Transform the GeometryWrapper into another spatial reference system.<br>
- * Option to store the resulting GeometryWrapper in the index.
- *
- * @param srsURI
- * @param storeSRSTransform
- * @return GeometryWrapper after transformation.
- * @throws MismatchedDimensionException
- * @throws TransformException
- * @throws FactoryException
- */
- protected GeometryWrapper transform(String srsURI, Boolean storeSRSTransform) throws MismatchedDimensionException, TransformException, FactoryException {
- if (srsInfo.getSrsURI().equals(srsURI)) {
- return this;
- }
-
- return GeometryTransformIndex.transform(this, srsURI, storeSRSTransform);
- }
-
- /**
- * Checks whether the prepared geometry has been initialised.
- * <br>Done lazily as expensive.
- */
- private void checkPreparedGeometry() {
- if (preparedGeometry == null) {
- this.preparedGeometry = PreparedGeometryFactory.prepare(xyGeometry);
- }
- }
-
- /**
- * Returns this geometry wrapper converted to the SRS_URI URI.
- *
- * @param srsURI
- * @return GeometryWrapper after conversion.
- * @throws FactoryException
- * @throws MismatchedDimensionException
- * @throws TransformException
- */
- public GeometryWrapper convertSRS(String srsURI) throws FactoryException, MismatchedDimensionException, TransformException {
- return transform(srsURI);
- }
-
- /**
- *
- * @return Coordinate/Spatial reference system of the GeometryWrapper.
- */
- public CoordinateReferenceSystem getCRS() {
- return srsInfo.getCrs();
- }
-
- /**
- *
- * @return Geometry with coordinates in x,y order, regardless of SRS_URI.
- */
- public Geometry getXYGeometry() {
- return xyGeometry;
- }
-
- /**
- *
- * @return Geometry with coordinates as originally provided.
- */
- public Geometry getParsingGeometry() {
- return parsingGeometry;
- }
-
- /**
- * XY geometry translated by the domain range of the SRS, if a Geographic
- * SRS.<br>
- * Returns XY geometry if not a Geographic SRS.
- *
- * @return Geometry after translation in X direction.
- */
- public Geometry translateXYGeometry() {
-
- if (translateXYGeometry == null) {
-
- if (srsInfo.isGeographic()) {
- double xTranslate = srsInfo.getDomainRangeX();
- AffineTransformation translation = AffineTransformation.translationInstance(xTranslate, 0);
- translateXYGeometry = translation.transform(xyGeometry); //Translate seems to be copying Y values into Z and M.
- } else {
- translateXYGeometry = xyGeometry;
- }
-
- }
-
- return translateXYGeometry;
- }
-
- /**
- *
- * @return Coordinate/Spatial reference system URI.
- */
- public String getSrsURI() {
- return srsInfo.getSrsURI();
- }
-
- /**
- *
- * @return getSRID used in GeoSPARQL Standard page 22 to refer to srsURI.
- * i.e. getSrsURI and getSRID are the same.
- */
- public String getSRID() {
- return srsInfo.getSrsURI();
- }
-
- /**
- *
- * @return SRS information that the Geometry Wrapper is using.
- */
- public SRSInfo getSrsInfo() {
- return srsInfo;
- }
-
- /**
- *
- * @return Whether the SRS URI has been recognised. Operations may fail or
- * not perform correctly when false.
- */
- public Boolean isSRSRecognised() {
- return srsInfo.isSRSRecognised();
- }
-
- /**
- *
- * @return Datatype URI of the literal.
- */
- public String getGeometryDatatypeURI() {
- return geometryDatatypeURI;
- }
-
- /**
- *
- * @return The name of the parsing Geometry's actual class.
- */
- public String getGeometryType() {
- return parsingGeometry.getGeometryType();
- }
-
- /**
- *
- * @return GeometryDatatype of the literal.
- */
- public GeometryDatatype getGeometryDatatype() {
-
- if (geometryDatatype == null) {
- geometryDatatype = GeometryDatatype.get(geometryDatatypeURI);
- }
- return geometryDatatype;
- }
-
- /**
- *
- * @param distance
- * @param targetDistanceUnitsURI
- * @return Buffer around GeometryWrapper according the provided distance.
- * @throws FactoryException
- * @throws MismatchedDimensionException
- * @throws TransformException
- */
- public GeometryWrapper buffer(double distance, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
-
- //Check whether the source geometry is linear units for cartesian calculation. If not then transform to relevant UTM SRS GeometryWrapper.
- Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
- GeometryWrapper transformedGeometryWrapper;
- Boolean isTransformNeeded;
-
- if (srsInfo.getUnitsOfMeasure().isLinearUnits() == isTargetUnitsLinear) {
- //Source geometry and target units are both the same.
- transformedGeometryWrapper = this;
- isTransformNeeded = false;
- } else if (isTargetUnitsLinear) {
- //Source geometry is not linear but targets are so convert to linear SRS.
- String sourceUtmURI = getUTMZoneURI();
- transformedGeometryWrapper = transform(sourceUtmURI);
- isTransformNeeded = true;
- } else {
- //Source geometry is linear but targets are not so convert to nonlinear SRS.
- transformedGeometryWrapper = transform(SRS_URI.DEFAULT_WKT_CRS84);
- isTransformNeeded = true;
- }
-
- //Check whether the units of the distance need converting.
- double transformedDistance = UnitsOfMeasure.conversion(distance, targetDistanceUnitsURI, transformedGeometryWrapper.srsInfo.getUnitsOfMeasure().getUnitURI());
-
- //Buffer the transformed geometry
- Geometry xyGeo = transformedGeometryWrapper.xyGeometry.buffer(transformedDistance);
- DimensionInfo bufferedDimensionInfo = new DimensionInfo(dimensionInfo.getCoordinate(), dimensionInfo.getSpatial(), xyGeo.getDimension());
- Geometry parsingGeo = GeometryReverse.check(xyGeo, transformedGeometryWrapper.srsInfo);
- GeometryWrapper bufferedGeometryWrapper = new GeometryWrapper(parsingGeo, xyGeo, transformedGeometryWrapper.srsInfo.getSrsURI(), transformedGeometryWrapper.geometryDatatypeURI, bufferedDimensionInfo);
-
- //Check whether need to transform back to the original srsURI.
- if (isTransformNeeded) {
- //Don't store the buffered geometry as it is dependent upon the target distance and so likely to vary beween calls.
- return bufferedGeometryWrapper.transform(srsInfo.getSrsURI(), false);
- } else {
- return bufferedGeometryWrapper;
- }
- }
-
- /**
- *
- * @return URI of the GeometryWrapper's UTM zone
- * @throws FactoryException
- * @throws MismatchedDimensionException
- * @throws TransformException
- */
- public String getUTMZoneURI() throws FactoryException, MismatchedDimensionException, TransformException {
-
- if (utmURI == null) {
-
- //Find a point in the parsing geometry so can directly apply the SRS.
- Point coord = parsingGeometry.getCentroid();
- DirectPosition2D point = new DirectPosition2D(coord.getX(), coord.getY());
-
- //Convert to WGS84. Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
- CoordinateReferenceSystem wgs84CRS = SRSRegistry.getCRS(SRS_URI.WGS84_CRS);
- MathTransform transform = MathTransformRegistry.getMathTransform(srsInfo.getCrs(), wgs84CRS);
-
- DirectPosition wgs84Point = transform.transform(point, null);
-
- //Find the UTM zone.
- utmURI = SRSRegistry.findUTMZoneURIFromWGS84(wgs84Point.getOrdinate(0), wgs84Point.getOrdinate(1));
-
- }
- return utmURI;
- }
-
- /**
- * Latitude if Geographic SRS or in WGS84.<br>
- * Used to convert between linear and non-linear units of measure.
- *
- * @return Latitude of Geometry.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public Double getLatitude() throws FactoryException, MismatchedDimensionException, TransformException {
-
- if (latitude == null) {
- GeometryWrapper geoGeometryWrapper;
-
- if (srsInfo.isGeographic()) {
- //Already a geographic SRS.
- geoGeometryWrapper = this;
- } else {
- //Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
- geoGeometryWrapper = convertSRS(SRS_URI.WGS84_CRS);
- }
-
- //Latitude is Y-axis.
- Geometry geometry = geoGeometryWrapper.getXYGeometry();
- Point point = geometry.getCentroid();
- latitude = point.getY();
-
- }
- return latitude;
- }
-
- /**
- * Distance (Euclidean) defaulting to metres.
- *
- * @param targetGeometry
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceEuclidean(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return distanceEuclidean(targetGeometry, Unit_URI.METRE_URL);
- }
-
- /**
- * Distance (Euclidean) in the Units of Measure.
- *
- * @param targetGeometry
- * @param unitsOfMeasure
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceEuclidean(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
- return distanceEuclidean(targetGeometry, unitsOfMeasure.getUnitURI());
- }
-
- /**
- * Distance (Euclidean) in the Units of Measure stated in URI.
- *
- * @param targetGeometry
- * @param targetDistanceUnitsURI
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceEuclidean(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
-
- Boolean isUnitsLinear = srsInfo.getUnitsOfMeasure().isLinearUnits();
- Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
-
- GeometryWrapper transformedTargetGeometry = checkTransformSRS(targetGeometry);
-
- double distance = xyGeometry.distance(transformedTargetGeometry.xyGeometry);
- String unitsURI = srsInfo.getUnitsOfMeasure().getUnitURI();
-
- double targetDistance;
- if (isUnitsLinear.equals(isTargetUnitsLinear)) {
- //Units are same so straight conversion.
- targetDistance = UnitsOfMeasure.conversion(distance, unitsURI, targetDistanceUnitsURI);
- } else {
- targetDistance = UnitsOfMeasure.convertBetween(distance, unitsURI, targetDistanceUnitsURI, isTargetUnitsLinear, getLatitude());
- }
-
- return targetDistance;
- }
-
- /**
- * Distance (Great Circle) defaulting to metres.
- *
- * @param targetGeometry
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceGreatCircle(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return distanceGreatCircle(targetGeometry, Unit_URI.METRE_URL);
- }
-
- /**
- * Distance (Great Circle) in the Units of Measure.
- *
- * @param targetGeometry
- * @param unitsOfMeasure
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceGreatCircle(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
- return distanceGreatCircle(targetGeometry, unitsOfMeasure.getUnitURI());
- }
-
- /**
- * Distance (Great Circle) in the Units of Measure stated in URI.
- *
- * @param targetGeometry
- * @param targetDistanceUnitsURI
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distanceGreatCircle(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
-
- GeometryWrapper transformedSourceGeometry;
- if (srsInfo.isGeographic()) {
- //Already a geographic SRS.
- transformedSourceGeometry = this;
- } else {
- //Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
- transformedSourceGeometry = this.transform(SRS_URI.WGS84_CRS);
- }
-
- GeometryWrapper transformedTargetGeometry = transformedSourceGeometry.checkTransformSRS(targetGeometry);
-
- //Find the nearest pair of coordinates from each Geometry using Euclidean distance (adjusting for wrap around).
- //These are then used for Great Circle distance.
- CoordinatePair coordinatePair = CoordinatePair.findNearestPair(transformedSourceGeometry, transformedTargetGeometry);
-
- //Check whether the nearest pair are the same, i.e. the overlap or within each other.
- if (coordinatePair.isEqual()) {
- //Exit early as the distance is zero.
- return 0.0;
- }
-
- Coordinate coord1 = coordinatePair.getCoord1();
- Coordinate coord2 = coordinatePair.getCoord2();
-
- //Vincenty Formula is apparently more accurate at the Longitude boundary.
- double distance = GreatCircleDistance.vincentyFormula(coord1.getY(), coord1.getX(), coord2.getY(), coord2.getX());
- //double distance = GreatCircleDistance.haversineFormula(coord1.getY(), coord1.getX(), coord2.getY(), coord2.getX());
-
- //Convert the Great Circle distance from metres into the requested units.
- Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
- double targetDistance;
- if (isTargetUnitsLinear) {
- //Target units are linear so straight conversion. Distance is in metres already.
- targetDistance = UnitsOfMeasure.conversion(distance, Unit_URI.METRE_URL, targetDistanceUnitsURI);
- } else {
- targetDistance = UnitsOfMeasure.convertBetween(distance, Unit_URI.METRE_URL, targetDistanceUnitsURI, isTargetUnitsLinear, transformedSourceGeometry.getLatitude());
- }
-
- return targetDistance;
- }
-
- /**
- * Distance (Euclidean or Great Circle depending on Geometry SRS URI)
- * defaulting to metres.
- *
- * @param targetGeometry
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distance(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- return distance(targetGeometry, Unit_URI.METRE_URL);
- }
-
- /**
- * Distance (Euclidean or Great Circle depending on Geometry SRS URI) in the
- * Units of Measure.
- *
- * @param targetGeometry
- * @param unitsOfMeasure
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distance(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
- return distance(targetGeometry, unitsOfMeasure.getUnitURI());
- }
-
- /**
- * Distance (Euclidean or Great Circle depending on Geometry SRS URI) in the
- * Units of Measure stated in URI.
- *
- * @param targetGeometry
- * @param targetDistanceUnitsURI
- * @return Distance
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public double distance(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
-
- double targetDistance;
- if (srsInfo.isGeographic()) {
- targetDistance = distanceGreatCircle(targetGeometry, targetDistanceUnitsURI);
- } else {
- targetDistance = distanceEuclidean(targetGeometry, targetDistanceUnitsURI);
- }
-
- return targetDistance;
- }
-
- /**
- *
- * @return Boundary of GeometryWrapper
- */
- public GeometryWrapper boundary() {
- Geometry xyGeo = this.xyGeometry.getBoundary();
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- *
- * @return Convex Hull of GeometryWrapper
- */
- public GeometryWrapper convexHull() {
- Geometry xyGeo = this.xyGeometry.convexHull();
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Difference of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public GeometryWrapper difference(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- Geometry xyGeo = this.xyGeometry.difference(transformedGeometry.xyGeometry);
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- * Envelope of GeometryWrapper with original coordinate order.
- *
- * @return Envelope of GeometryWrapper
- */
- public GeometryWrapper envelope() {
- GeometryFactory geometryFactory = this.xyGeometry.getFactory();
- Envelope xyEnvelope = this.getEnvelope();
- Geometry xyGeo = geometryFactory.toGeometry(xyEnvelope);
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- * Envelope of GeometryWrapper in XY order.
- *
- * @return Envelope of GeometryWrapper
- */
- public Envelope getEnvelope() {
- if (envelope == null) {
- envelope = this.xyGeometry.getEnvelopeInternal();
- }
-
- return envelope;
- }
-
- /**
- *
- * @param targetGeometry
- * @return Intersection of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public GeometryWrapper intersection(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- Geometry xyGeo = this.xyGeometry.intersection(transformedGeometry.xyGeometry);
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Intersection Matrix of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public IntersectionMatrix relate(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return xyGeometry.relate(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @param intersectionPattern
- * @return Relation of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean relate(GeometryWrapper targetGeometry, String intersectionPattern) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return xyGeometry.relate(transformedGeometry.xyGeometry, intersectionPattern);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Symmetric Difference of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public GeometryWrapper symDifference(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- Geometry xyGeo = this.xyGeometry.symDifference(transformedGeometry.xyGeometry);
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo, null);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Union of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public GeometryWrapper union(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- Geometry xyGeo = this.xyGeometry.union(transformedGeometry.xyGeometry);
- Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
- return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo, null);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfContains of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean contains(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.contains(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfCrosses of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean crosses(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.crosses(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfDisjoint of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean disjoint(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.disjoint(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Topology equals of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean equalsTopo(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.xyGeometry.equalsTopo(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return Equals exactly of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean equalsExact(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.xyGeometry.equalsExact(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @param tolerance
- * @return Equals exactly of GeometryWrapper with target using provided
- * tolerance.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean equalsExact(GeometryWrapper targetGeometry, double tolerance) throws FactoryException, MismatchedDimensionException, TransformException {
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.xyGeometry.equalsExact(transformedGeometry.xyGeometry, tolerance);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfIntersects of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean intersects(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.intersects(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfOverlaps of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean overlaps(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.overlaps(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfTouches of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean touches(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.touches(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @param targetGeometry
- * @return sfWithin of GeometryWrapper with target.
- * @throws org.opengis.util.FactoryException
- * @throws org.opengis.referencing.operation.TransformException
- */
- public boolean within(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
- this.checkPreparedGeometry();
- GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
- return this.preparedGeometry.within(transformedGeometry.xyGeometry);
- }
-
- /**
- *
- * @return GeometryWrapper as NodeValue
- */
- public NodeValue asNodeValue() throws DatatypeFormatException {
- Literal literal = asLiteral();
- return NodeValue.makeNode(literal.getLexicalForm(), literal.getDatatype());
- }
-
- /**
- *
- * @return GeometryWrapper as Node
- */
- public Node asNode() throws DatatypeFormatException {
- return asNodeValue().asNode();
- }
-
- /**
- *
- * @return GeometryWrapper as Literal
- */
- public Literal asLiteral() throws DatatypeFormatException {
-
- GeometryDatatype datatype = getGeometryDatatype(); //Datatype is only retrieved when required.
- if (lexicalForm != null) {
- return ResourceFactory.createTypedLiteral(lexicalForm, datatype);
- }
-
- Literal literal = asLiteral(datatype);
- lexicalForm = literal.getLexicalForm();
- return literal;
- }
-
- /**
- *
- * @param outputGeometryDatatypeURI
- * @return GeometryWrapper as Literal in datatype form.
- */
- public Literal asLiteral(String outputGeometryDatatypeURI) throws DatatypeFormatException {
- GeometryDatatype datatype = GeometryDatatype.get(outputGeometryDatatypeURI);
- return asLiteral(datatype);
- }
-
- /**
- *
- * @param datatype
- * @return GeometryWrapper as Literal
- */
- public Literal asLiteral(GeometryDatatype datatype) {
- String tempLexicalForm = datatype.unparse(this);
- return ResourceFactory.createTypedLiteral(tempLexicalForm, datatype);
- }
-
- /**
- *
- * @return Coordinate dimension, i.e. 2 (x,y), 3 (x,y,z or x,y,m) or 4
- * (x,y,z,m)
- */
- public int getCoordinateDimension() {
- return dimensionInfo.getCoordinate();
- }
-
- /**
- *
- * @return Spatial dimension, i.e. 2 or 3
- */
- public int getSpatialDimension() {
- return dimensionInfo.getSpatial();
- }
-
- /**
- *
- * @return Topological dimension, i.e. 0, 1 or 2
- */
- public int getTopologicalDimension() {
- return dimensionInfo.getTopological();
- }
-
- /**
- *
- * @return Enum of coordinate dimensions.
- */
- public CoordinateSequenceDimensions getCoordinateSequenceDimensions() {
- return dimensionInfo.getDimensions();
- }
-
- /**
- *
- * @return Units of Measure for the GeometryWrapper SRS.
- */
- public UnitsOfMeasure getUnitsOfMeasure() {
- return srsInfo.getUnitsOfMeasure();
- }
-
- /**
- *
- * @return GeometryWrapper's coordinate, spatial and topological dimensions.
- */
- public DimensionInfo getDimensionInfo() {
- return dimensionInfo;
- }
-
- /**
- *
- * @return String literal of Geometry Wrapper.
- */
- public String getLexicalForm() {
-
- if (lexicalForm != null) {
- return lexicalForm;
- } else {
- Literal literal = asLiteral();
- return literal.getLexicalForm();
- }
- }
-
- /**
- *
- * @return Geometry is empty of coordinates.
- */
- public boolean isEmpty() {
- return this.xyGeometry.isEmpty();
- }
-
- /**
- *
- * @return Geometry is in simple form.
- */
- public boolean isSimple() {
- return this.xyGeometry.isSimple();
- }
-
- /**
- *
- * @return Geometry is topologically valid.
- */
- public boolean isValid() {
- return this.xyGeometry.isValid();
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param geometryLiteral
- * @param targetIndex
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(NodeValue geometryLiteral, GeometryIndex targetIndex) {
-
- Node node = geometryLiteral.asNode();
-
- return extract(node, targetIndex);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param geometryLiteral
- * @param targetIndex
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(Node geometryLiteral, GeometryIndex targetIndex) throws DatatypeFormatException {
-
- if (!geometryLiteral.isLiteral()) {
- throw new DatatypeFormatException("Not a Literal: " + geometryLiteral);
- }
-
- String datatypeURI = geometryLiteral.getLiteralDatatypeURI();
- String lexicalForm = geometryLiteral.getLiteralLexicalForm();
- return extract(lexicalForm, datatypeURI, targetIndex);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param geometryLiteral
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(NodeValue geometryLiteral) {
- return extract(geometryLiteral, GeometryIndex.PRIMARY);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param geometryLiteral
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(Node geometryLiteral) {
- return extract(geometryLiteral, GeometryIndex.PRIMARY);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal. Returns null if invalid
- * literal provided.
- *
- * @param geometryLiteral
- * @param targetIndex
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(Literal geometryLiteral, GeometryIndex targetIndex) {
- return extract(geometryLiteral.getLexicalForm(), geometryLiteral.getDatatypeURI(), targetIndex);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param geometryLiteral
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static final GeometryWrapper extract(Literal geometryLiteral) {
- return extract(geometryLiteral, GeometryIndex.PRIMARY);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param lexicalForm
- * @param datatypeURI
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static GeometryWrapper extract(String lexicalForm, String datatypeURI) {
- return extract(lexicalForm, datatypeURI, GeometryIndex.PRIMARY);
- }
-
- /**
- * Extract Geometry Wrapper from Geometry Literal.
- *
- * @param lexicalForm
- * @param datatypeURI
- * @param targetIndex
- * @return Geometry Wrapper of the Geometry Literal.
- */
- public static GeometryWrapper extract(String lexicalForm, String datatypeURI, GeometryIndex targetIndex) throws DatatypeFormatException {
-
- if (lexicalForm == null || datatypeURI == null) {
- throw new DatatypeFormatException("GeometryWrapper extraction: arguments cannot be null - " + lexicalForm + ", " + datatypeURI);
- }
-
- GeometryDatatype datatype = GeometryDatatype.get(datatypeURI);
- GeometryWrapper geometry = datatype.parse(lexicalForm, targetIndex);
- return geometry;
- }
-
- /**
- * Builds a WKT Point of Geometry Wrapper.<br>
- * This method does not use the GeometryLiteralIndex and so is best used for
- * one of Geometry Wrappers.
- *
- * @return Geometry Wrapper of WKT Point.
- */
- public static final GeometryWrapper fromPoint(double x, double y, String srsURI) {
- CustomCoordinateSequence coordSequence = CustomCoordinateSequence.createPoint(x, y);
- GeometryWrapper geometryWrapper = new GeometryWrapper(coordSequence, WKTDatatype.URI, srsURI);
- return geometryWrapper;
- }
-
- /**
- *
- * @return Empty GeometryWrapper in WKT datatype.
- */
- public static final GeometryWrapper getEmptyWKT() {
- return WKTDatatype.INSTANCE.read("");
- }
-
- /**
- *
- * @return Empty GeometryWrapper in GML datatype.
- */
- public static final GeometryWrapper getEmptyGML() {
- return GMLDatatype.INSTANCE.read("");
- }
-
- @Override
- public int hashCode() {
- int hash = 3;
- hash = 23 * hash + Objects.hashCode(this.dimensionInfo);
- hash = 23 * hash + Objects.hashCode(this.srsInfo);
- hash = 23 * hash + Objects.hashCode(this.xyGeometry);
- hash = 23 * hash + Objects.hashCode(this.geometryDatatypeURI);
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final GeometryWrapper other = (GeometryWrapper) obj;
- if (!Objects.equals(this.geometryDatatypeURI, other.geometryDatatypeURI)) {
- return false;
- }
- if (!Objects.equals(this.dimensionInfo, other.dimensionInfo)) {
- return false;
- }
- if (!Objects.equals(this.srsInfo, other.srsInfo)) {
- return false;
- }
- return Objects.equals(this.xyGeometry, other.xyGeometry);
- }
-
- @Override
- public String toString() {
- return "GeometryWrapper{" + "dimensionInfo=" + dimensionInfo + ", geometryDatatypeURI=" + geometryDatatypeURI + ", lexicalForm=" + lexicalForm + ", utmURI=" + utmURI + ", latitude=" + latitude + ", xyGeometry=" + xyGeometry + ", parsingGeometry=" + parsingGeometry + ", preparedGeometry=" + preparedGeometry + ", srsInfo=" + srsInfo + '}';
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation;
+
+import java.io.Serializable;
+import java.util.Objects;
+import org.apache.jena.datatypes.DatatypeFormatException;
+import org.apache.jena.geosparql.implementation.datatype.GMLDatatype;
+import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
+import org.apache.jena.geosparql.implementation.datatype.WKTDatatype;
+import org.apache.jena.geosparql.implementation.great_circle.CoordinatePair;
+import org.apache.jena.geosparql.implementation.great_circle.GreatCircleDistance;
+import org.apache.jena.geosparql.implementation.index.GeometryLiteralIndex.GeometryIndex;
+import org.apache.jena.geosparql.implementation.index.GeometryTransformIndex;
+import org.apache.jena.geosparql.implementation.jts.CoordinateSequenceDimensions;
+import org.apache.jena.geosparql.implementation.jts.CustomCoordinateSequence;
+import org.apache.jena.geosparql.implementation.jts.CustomGeometryFactory;
+import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
+import org.apache.jena.geosparql.implementation.vocabulary.SRS_URI;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.jena.graph.Node;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.sis.geometry.DirectPosition2D;
+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.IntersectionMatrix;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.prep.PreparedGeometry;
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
+import org.locationtech.jts.geom.util.AffineTransformation;
+import org.opengis.geometry.DirectPosition;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class GeometryWrapper implements Serializable {
+
+ private final DimensionInfo dimensionInfo;
+ private final SRSInfo srsInfo;
+ private final Geometry xyGeometry;
+ private final Geometry parsingGeometry;
+ private PreparedGeometry preparedGeometry;
+ private Envelope envelope;
+ private Geometry translateXYGeometry;
+ private final String geometryDatatypeURI;
+ private GeometryDatatype geometryDatatype;
+ private String lexicalForm;
+ private String utmURI = null;
+ private Double latitude = null;
+
+ /**
+ *
+ * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
+ * @param srsURI
+ * @param geometryDatatypeURI
+ * @param dimensionInfo
+ */
+ public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo) {
+ this(geometry, srsURI, geometryDatatypeURI, dimensionInfo, null);
+ }
+
+ /**
+ *
+ * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
+ * @param srsURI
+ * @param geometryDatatypeURI
+ * @param dimensionInfo
+ * @param geometryLiteral
+ */
+ public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo, String geometryLiteral) {
+ this(geometry, GeometryReverse.check(geometry, srsURI.isEmpty() ? SRS_URI.DEFAULT_WKT_CRS84 : srsURI), srsURI.isEmpty() ? SRS_URI.DEFAULT_WKT_CRS84 : srsURI, geometryDatatypeURI, dimensionInfo, geometryLiteral);
+ }
+
+ protected GeometryWrapper(Geometry parsingGeometry, Geometry xyGeometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo) {
+ this(parsingGeometry, xyGeometry, srsURI, geometryDatatypeURI, dimensionInfo, null);
+ }
+
+ protected GeometryWrapper(Geometry parsingGeometry, Geometry xyGeometry, String srsURI, String geometryDatatypeURI, DimensionInfo dimensionInfo, String lexicalForm) {
+
+ this.parsingGeometry = parsingGeometry;
+ this.xyGeometry = xyGeometry;
+ this.preparedGeometry = null; //Initialised when required by spatial relations checkPreparedGeometry.
+ this.envelope = null; //Initialised when required by getEnvelope().
+ this.translateXYGeometry = null; //Initialised when required by translateGeometry().
+ this.geometryDatatypeURI = geometryDatatypeURI;
+ this.geometryDatatype = null; //Inilialised when required by getGeometryDatatype().
+
+ if (srsURI.isEmpty()) {
+ srsURI = SRS_URI.DEFAULT_WKT_CRS84;
+ }
+
+ this.srsInfo = SRSRegistry.getSRSInfo(srsURI);
+
+ this.dimensionInfo = dimensionInfo;
+ this.lexicalForm = lexicalForm; //If not Initialised then required by asLiteral() etc.
+ }
+
+ /**
+ * Default to WGS84 geometry and XY coordinate dimensions.
+ *
+ * @param geometry In X/Y or Y/X coordinate order of WGS84.
+ * @param geometryDatatypeURI
+ */
+ public GeometryWrapper(Geometry geometry, String geometryDatatypeURI) {
+ this(geometry, "", geometryDatatypeURI, DimensionInfo.XY_POINT);
+ }
+
+ /**
+ * Default to XY coordinate dimensions.
+ *
+ * @param geometry In X/Y or Y/X coordinate order of the SRS URI.
+ * @param srsURI
+ * @param geometryDatatypeURI
+ */
+ public GeometryWrapper(Geometry geometry, String srsURI, String geometryDatatypeURI) {
+ this(geometry, srsURI, geometryDatatypeURI, DimensionInfo.XY_POINT);
+ }
+
+ /**
+ * Empty geometry with specified parameters.
+ *
+ * @param srsURI
+ * @param geometryDatatypeURI
+ */
+ public GeometryWrapper(String srsURI, String geometryDatatypeURI) {
+ this(new CustomCoordinateSequence(DimensionInfo.XY_POINT.getDimensions()), geometryDatatypeURI, srsURI);
+ }
+
+ /**
+ * Point geometry with specified SRS.
+ *
+ * @param pointCoordinateSequence
+ * @param geometryDatatypeURI
+ * @param srsURI
+ */
+ public GeometryWrapper(CustomCoordinateSequence pointCoordinateSequence, String geometryDatatypeURI, String srsURI) {
+ this(CustomGeometryFactory.theInstance().createPoint(pointCoordinateSequence), srsURI, geometryDatatypeURI, DimensionInfo.XY_POINT);
+ }
+
+ /**
+ * Copy GeometryWrapper.
+ *
+ * @param geometryWrapper
+ */
+ public GeometryWrapper(GeometryWrapper geometryWrapper) {
+
+ this.xyGeometry = geometryWrapper.xyGeometry;
+ this.parsingGeometry = geometryWrapper.parsingGeometry;
+ this.preparedGeometry = geometryWrapper.preparedGeometry;
+ this.envelope = geometryWrapper.envelope;
+ this.translateXYGeometry = geometryWrapper.translateXYGeometry;
+ this.utmURI = geometryWrapper.utmURI;
+ this.latitude = geometryWrapper.latitude;
+ this.geometryDatatypeURI = geometryWrapper.geometryDatatypeURI;
+ this.geometryDatatype = geometryWrapper.geometryDatatype;
+
+ this.srsInfo = geometryWrapper.srsInfo;
+ this.dimensionInfo = geometryWrapper.dimensionInfo;
+ this.lexicalForm = geometryWrapper.lexicalForm;
+ }
+
+ /**
+ * Transforms, if necessary, the provided target GeometryWrapper according
+ * to this GeometryWrapper SRS_URI.
+ *
+ * @param targetGeometryWrapper
+ * @return GeometryWrapper after transformation.
+ * @throws FactoryException
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ */
+ public GeometryWrapper checkTransformSRS(GeometryWrapper targetGeometryWrapper) throws FactoryException, MismatchedDimensionException, TransformException {
+
+ GeometryWrapper transformedGeometryWrapper;
+ String srsURI = srsInfo.getSrsURI();
+ if (srsURI.equals(targetGeometryWrapper.srsInfo.getSrsURI())) {
+ transformedGeometryWrapper = targetGeometryWrapper;
+ } else {
+ transformedGeometryWrapper = targetGeometryWrapper.transform(srsURI);
+ }
+
+ return transformedGeometryWrapper;
+ }
+
+ /**
+ * Transform the GeometryWrapper into another spatial reference system.<br>
+ *
+ * @param srsURI
+ * @return New GeometryWrapper after transformation, or this GeometryWrapper
+ * if no transformation.
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ * @throws FactoryException
+ */
+ public GeometryWrapper transform(String srsURI) throws MismatchedDimensionException, TransformException, FactoryException {
+ return transform(srsURI, true);
+ }
+
+ /**
+ * Transform the GeometryWrapper into another spatial reference system.<br>
+ *
+ * @param srsInfo
+ * @return New GeometryWrapper after transformation, or this GeometryWrapper
+ * if no transformation.
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ * @throws FactoryException
+ */
+ public GeometryWrapper transform(SRSInfo srsInfo) throws MismatchedDimensionException, TransformException, FactoryException {
+ return transform(srsInfo.getSrsURI(), true);
+ }
+
+ /**
+ * Transform the GeometryWrapper into another spatial reference system.<br>
+ * Option to store the resulting GeometryWrapper in the index.
+ *
+ * @param srsURI
+ * @param storeSRSTransform
+ * @return GeometryWrapper after transformation.
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ * @throws FactoryException
+ */
+ protected GeometryWrapper transform(String srsURI, Boolean storeSRSTransform) throws MismatchedDimensionException, TransformException, FactoryException {
+ if (srsInfo.getSrsURI().equals(srsURI)) {
+ return this;
+ }
+
+ return GeometryTransformIndex.transform(this, srsURI, storeSRSTransform);
+ }
+
+ /**
+ * Checks whether the prepared geometry has been initialised.
+ * <br>Done lazily as expensive.
+ */
+ private void checkPreparedGeometry() {
+ if (preparedGeometry == null) {
+ this.preparedGeometry = PreparedGeometryFactory.prepare(xyGeometry);
+ }
+ }
+
+ /**
+ * Returns this geometry wrapper converted to the SRS_URI URI.
+ *
+ * @param srsURI
+ * @return GeometryWrapper after conversion.
+ * @throws FactoryException
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ */
+ public GeometryWrapper convertSRS(String srsURI) throws FactoryException, MismatchedDimensionException, TransformException {
+ return transform(srsURI);
+ }
+
+ /**
+ *
+ * @return Coordinate/Spatial reference system of the GeometryWrapper.
+ */
+ public CoordinateReferenceSystem getCRS() {
+ return srsInfo.getCrs();
+ }
+
+ /**
+ *
+ * @return Geometry with coordinates in x,y order, regardless of SRS_URI.
+ */
+ public Geometry getXYGeometry() {
+ return xyGeometry;
+ }
+
+ /**
+ *
+ * @return Geometry with coordinates as originally provided.
+ */
+ public Geometry getParsingGeometry() {
+ return parsingGeometry;
+ }
+
+ /**
+ * XY geometry translated by the domain range of the SRS, if a Geographic
+ * SRS.<br>
+ * Returns XY geometry if not a Geographic SRS.
+ *
+ * @return Geometry after translation in X direction.
+ */
+ public Geometry translateXYGeometry() {
+
+ if (translateXYGeometry == null) {
+
+ if (srsInfo.isGeographic()) {
+ double xTranslate = srsInfo.getDomainRangeX();
+ AffineTransformation translation = AffineTransformation.translationInstance(xTranslate, 0);
+ translateXYGeometry = translation.transform(xyGeometry); //Translate seems to be copying Y values into Z and M.
+ } else {
+ translateXYGeometry = xyGeometry;
+ }
+
+ }
+
+ return translateXYGeometry;
+ }
+
+ /**
+ *
+ * @return Coordinate/Spatial reference system URI.
+ */
+ public String getSrsURI() {
+ return srsInfo.getSrsURI();
+ }
+
+ /**
+ *
+ * @return getSRID used in GeoSPARQL Standard page 22 to refer to srsURI.
+ * i.e. getSrsURI and getSRID are the same.
+ */
+ public String getSRID() {
+ return srsInfo.getSrsURI();
+ }
+
+ /**
+ *
+ * @return SRS information that the Geometry Wrapper is using.
+ */
+ public SRSInfo getSrsInfo() {
+ return srsInfo;
+ }
+
+ /**
+ *
+ * @return Whether the SRS URI has been recognised. Operations may fail or
+ * not perform correctly when false.
+ */
+ public Boolean isSRSRecognised() {
+ return srsInfo.isSRSRecognised();
+ }
+
+ /**
+ *
+ * @return Datatype URI of the literal.
+ */
+ public String getGeometryDatatypeURI() {
+ return geometryDatatypeURI;
+ }
+
+ /**
+ *
+ * @return The name of the parsing Geometry's actual class.
+ */
+ public String getGeometryType() {
+ return parsingGeometry.getGeometryType();
+ }
+
+ /**
+ *
+ * @return GeometryDatatype of the literal.
+ */
+ public GeometryDatatype getGeometryDatatype() {
+
+ if (geometryDatatype == null) {
+ geometryDatatype = GeometryDatatype.get(geometryDatatypeURI);
+ }
+ return geometryDatatype;
+ }
+
+ /**
+ *
+ * @param distance
+ * @param targetDistanceUnitsURI
+ * @return Buffer around GeometryWrapper according the provided distance.
+ * @throws FactoryException
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ */
+ public GeometryWrapper buffer(double distance, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
+
+ //Check whether the source geometry is linear units for cartesian calculation. If not then transform to relevant UTM SRS GeometryWrapper.
+ Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
+ GeometryWrapper transformedGeometryWrapper;
+ Boolean isTransformNeeded;
+
+ if (srsInfo.getUnitsOfMeasure().isLinearUnits() == isTargetUnitsLinear) {
+ //Source geometry and target units are both the same.
+ transformedGeometryWrapper = this;
+ isTransformNeeded = false;
+ } else if (isTargetUnitsLinear) {
+ //Source geometry is not linear but targets are so convert to linear SRS.
+ String sourceUtmURI = getUTMZoneURI();
+ transformedGeometryWrapper = transform(sourceUtmURI);
+ isTransformNeeded = true;
+ } else {
+ //Source geometry is linear but targets are not so convert to nonlinear SRS.
+ transformedGeometryWrapper = transform(SRS_URI.DEFAULT_WKT_CRS84);
+ isTransformNeeded = true;
+ }
+
+ //Check whether the units of the distance need converting.
+ double transformedDistance = UnitsOfMeasure.conversion(distance, targetDistanceUnitsURI, transformedGeometryWrapper.srsInfo.getUnitsOfMeasure().getUnitURI());
+
+ //Buffer the transformed geometry
+ Geometry xyGeo = transformedGeometryWrapper.xyGeometry.buffer(transformedDistance);
+ DimensionInfo bufferedDimensionInfo = new DimensionInfo(dimensionInfo.getCoordinate(), dimensionInfo.getSpatial(), xyGeo.getDimension());
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, transformedGeometryWrapper.srsInfo);
+ GeometryWrapper bufferedGeometryWrapper = new GeometryWrapper(parsingGeo, xyGeo, transformedGeometryWrapper.srsInfo.getSrsURI(), transformedGeometryWrapper.geometryDatatypeURI, bufferedDimensionInfo);
+
+ //Check whether need to transform back to the original srsURI.
+ if (isTransformNeeded) {
+ //Don't store the buffered geometry as it is dependent upon the target distance and so likely to vary beween calls.
+ return bufferedGeometryWrapper.transform(srsInfo.getSrsURI(), false);
+ } else {
+ return bufferedGeometryWrapper;
+ }
+ }
+
+ /**
+ *
+ * @return URI of the GeometryWrapper's UTM zone
+ * @throws FactoryException
+ * @throws MismatchedDimensionException
+ * @throws TransformException
+ */
+ public String getUTMZoneURI() throws FactoryException, MismatchedDimensionException, TransformException {
+
+ if (utmURI == null) {
+
+ //Find a point in the parsing geometry so can directly apply the SRS.
+ Point coord = parsingGeometry.getCentroid();
+ DirectPosition2D point = new DirectPosition2D(coord.getX(), coord.getY());
+
+ //Convert to WGS84. Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
+ CoordinateReferenceSystem wgs84CRS = SRSRegistry.getCRS(SRS_URI.WGS84_CRS);
+ MathTransform transform = MathTransformRegistry.getMathTransform(srsInfo.getCrs(), wgs84CRS);
+
+ DirectPosition wgs84Point = transform.transform(point, null);
+
+ //Find the UTM zone.
+ utmURI = SRSRegistry.findUTMZoneURIFromWGS84(wgs84Point.getOrdinate(0), wgs84Point.getOrdinate(1));
+
+ }
+ return utmURI;
+ }
+
+ /**
+ * Latitude if Geographic SRS or in WGS84.<br>
+ * Used to convert between linear and non-linear units of measure.
+ *
+ * @return Latitude of Geometry.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public Double getLatitude() throws FactoryException, MismatchedDimensionException, TransformException {
+
+ if (latitude == null) {
+ GeometryWrapper geoGeometryWrapper;
+
+ if (srsInfo.isGeographic()) {
+ //Already a geographic SRS.
+ geoGeometryWrapper = this;
+ } else {
+ //Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
+ geoGeometryWrapper = convertSRS(SRS_URI.WGS84_CRS);
+ }
+
+ //Latitude is Y-axis.
+ Geometry geometry = geoGeometryWrapper.getXYGeometry();
+ Point point = geometry.getCentroid();
+ latitude = point.getY();
+
+ }
+ return latitude;
+ }
+
+ /**
+ * Distance (Euclidean) defaulting to metres.
+ *
+ * @param targetGeometry
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceEuclidean(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distanceEuclidean(targetGeometry, Unit_URI.METRE_URL);
+ }
+
+ /**
+ * Distance (Euclidean) in the Units of Measure.
+ *
+ * @param targetGeometry
+ * @param unitsOfMeasure
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceEuclidean(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distanceEuclidean(targetGeometry, unitsOfMeasure.getUnitURI());
+ }
+
+ /**
+ * Distance (Euclidean) in the Units of Measure stated in URI.
+ *
+ * @param targetGeometry
+ * @param targetDistanceUnitsURI
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceEuclidean(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
+
+ Boolean isUnitsLinear = srsInfo.getUnitsOfMeasure().isLinearUnits();
+ Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
+
+ GeometryWrapper transformedTargetGeometry = checkTransformSRS(targetGeometry);
+
+ double distance = xyGeometry.distance(transformedTargetGeometry.xyGeometry);
+ String unitsURI = srsInfo.getUnitsOfMeasure().getUnitURI();
+
+ double targetDistance;
+ if (isUnitsLinear.equals(isTargetUnitsLinear)) {
+ //Units are same so straight conversion.
+ targetDistance = UnitsOfMeasure.conversion(distance, unitsURI, targetDistanceUnitsURI);
+ } else {
+ targetDistance = UnitsOfMeasure.convertBetween(distance, unitsURI, targetDistanceUnitsURI, isTargetUnitsLinear, getLatitude());
+ }
+
+ return targetDistance;
+ }
+
+ /**
+ * Distance (Great Circle) defaulting to metres.
+ *
+ * @param targetGeometry
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceGreatCircle(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distanceGreatCircle(targetGeometry, Unit_URI.METRE_URL);
+ }
+
+ /**
+ * Distance (Great Circle) in the Units of Measure.
+ *
+ * @param targetGeometry
+ * @param unitsOfMeasure
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceGreatCircle(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distanceGreatCircle(targetGeometry, unitsOfMeasure.getUnitURI());
+ }
+
+ /**
+ * Distance (Great Circle) in the Units of Measure stated in URI.
+ *
+ * @param targetGeometry
+ * @param targetDistanceUnitsURI
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distanceGreatCircle(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
+
+ GeometryWrapper transformedSourceGeometry;
+ if (srsInfo.isGeographic()) {
+ //Already a geographic SRS.
+ transformedSourceGeometry = this;
+ } else {
+ //Use WGS84 and not CRS84 as assuming WGS8 is more prevalent.
+ transformedSourceGeometry = this.transform(SRS_URI.WGS84_CRS);
+ }
+
+ GeometryWrapper transformedTargetGeometry = transformedSourceGeometry.checkTransformSRS(targetGeometry);
+
+ //Find the nearest pair of coordinates from each Geometry using Euclidean distance (adjusting for wrap around).
+ //These are then used for Great Circle distance.
+ CoordinatePair coordinatePair = CoordinatePair.findNearestPair(transformedSourceGeometry, transformedTargetGeometry);
+
+ //Check whether the nearest pair are the same, i.e. the overlap or within each other.
+ if (coordinatePair.isEqual()) {
+ //Exit early as the distance is zero.
+ return 0.0;
+ }
+
+ Coordinate coord1 = coordinatePair.getCoord1();
+ Coordinate coord2 = coordinatePair.getCoord2();
+
+ //Vincenty Formula is apparently more accurate at the Longitude boundary.
+ double distance = GreatCircleDistance.vincentyFormula(coord1.getY(), coord1.getX(), coord2.getY(), coord2.getX());
+ //double distance = GreatCircleDistance.haversineFormula(coord1.getY(), coord1.getX(), coord2.getY(), coord2.getX());
+
+ //Convert the Great Circle distance from metres into the requested units.
+ Boolean isTargetUnitsLinear = UnitsRegistry.isLinearUnits(targetDistanceUnitsURI);
+ double targetDistance;
+ if (isTargetUnitsLinear) {
+ //Target units are linear so straight conversion. Distance is in metres already.
+ targetDistance = UnitsOfMeasure.conversion(distance, Unit_URI.METRE_URL, targetDistanceUnitsURI);
+ } else {
+ targetDistance = UnitsOfMeasure.convertBetween(distance, Unit_URI.METRE_URL, targetDistanceUnitsURI, isTargetUnitsLinear, transformedSourceGeometry.getLatitude());
+ }
+
+ return targetDistance;
+ }
+
+ /**
+ * Distance (Euclidean or Great Circle depending on Geometry SRS URI)
+ * defaulting to metres.
+ *
+ * @param targetGeometry
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distance(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distance(targetGeometry, Unit_URI.METRE_URL);
+ }
+
+ /**
+ * Distance (Euclidean or Great Circle depending on Geometry SRS URI) in the
+ * Units of Measure.
+ *
+ * @param targetGeometry
+ * @param unitsOfMeasure
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distance(GeometryWrapper targetGeometry, UnitsOfMeasure unitsOfMeasure) throws FactoryException, MismatchedDimensionException, TransformException {
+ return distance(targetGeometry, unitsOfMeasure.getUnitURI());
+ }
+
+ /**
+ * Distance (Euclidean or Great Circle depending on Geometry SRS URI) in the
+ * Units of Measure stated in URI.
+ *
+ * @param targetGeometry
+ * @param targetDistanceUnitsURI
+ * @return Distance
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public double distance(GeometryWrapper targetGeometry, String targetDistanceUnitsURI) throws FactoryException, MismatchedDimensionException, TransformException {
+
+ double targetDistance;
+ if (srsInfo.isGeographic()) {
+ targetDistance = distanceGreatCircle(targetGeometry, targetDistanceUnitsURI);
+ } else {
+ targetDistance = distanceEuclidean(targetGeometry, targetDistanceUnitsURI);
+ }
+
+ return targetDistance;
+ }
+
+ /**
+ *
+ * @return Boundary of GeometryWrapper
+ */
+ public GeometryWrapper boundary() {
+ Geometry xyGeo = this.xyGeometry.getBoundary();
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ *
+ * @return Convex Hull of GeometryWrapper
+ */
+ public GeometryWrapper convexHull() {
+ Geometry xyGeo = this.xyGeometry.convexHull();
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Difference of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public GeometryWrapper difference(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ Geometry xyGeo = this.xyGeometry.difference(transformedGeometry.xyGeometry);
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ * Envelope of GeometryWrapper with original coordinate order.
+ *
+ * @return Envelope of GeometryWrapper
+ */
+ public GeometryWrapper envelope() {
+ GeometryFactory geometryFactory = this.xyGeometry.getFactory();
+ Envelope xyEnvelope = this.getEnvelope();
+ Geometry xyGeo = geometryFactory.toGeometry(xyEnvelope);
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ * Envelope of GeometryWrapper in XY order.
+ *
+ * @return Envelope of GeometryWrapper
+ */
+ public Envelope getEnvelope() {
+ if (envelope == null) {
+ envelope = this.xyGeometry.getEnvelopeInternal();
+ }
+
+ return envelope;
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Intersection of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public GeometryWrapper intersection(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ Geometry xyGeo = this.xyGeometry.intersection(transformedGeometry.xyGeometry);
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Intersection Matrix of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public IntersectionMatrix relate(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return xyGeometry.relate(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @param intersectionPattern
+ * @return Relation of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean relate(GeometryWrapper targetGeometry, String intersectionPattern) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return xyGeometry.relate(transformedGeometry.xyGeometry, intersectionPattern);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Symmetric Difference of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public GeometryWrapper symDifference(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ Geometry xyGeo = this.xyGeometry.symDifference(transformedGeometry.xyGeometry);
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo, null);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Union of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public GeometryWrapper union(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ Geometry xyGeo = this.xyGeometry.union(transformedGeometry.xyGeometry);
+ Geometry parsingGeo = GeometryReverse.check(xyGeo, srsInfo);
+ return new GeometryWrapper(parsingGeo, xyGeo, srsInfo.getSrsURI(), geometryDatatypeURI, dimensionInfo, null);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfContains of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean contains(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.contains(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfCrosses of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean crosses(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.crosses(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfDisjoint of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean disjoint(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.disjoint(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Topology equals of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean equalsTopo(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.xyGeometry.equalsTopo(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return Equals exactly of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean equalsExact(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.xyGeometry.equalsExact(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @param tolerance
+ * @return Equals exactly of GeometryWrapper with target using provided
+ * tolerance.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean equalsExact(GeometryWrapper targetGeometry, double tolerance) throws FactoryException, MismatchedDimensionException, TransformException {
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.xyGeometry.equalsExact(transformedGeometry.xyGeometry, tolerance);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfIntersects of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean intersects(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.intersects(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfOverlaps of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean overlaps(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.overlaps(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfTouches of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean touches(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.touches(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @param targetGeometry
+ * @return sfWithin of GeometryWrapper with target.
+ * @throws org.opengis.util.FactoryException
+ * @throws org.opengis.referencing.operation.TransformException
+ */
+ public boolean within(GeometryWrapper targetGeometry) throws FactoryException, MismatchedDimensionException, TransformException {
+ this.checkPreparedGeometry();
+ GeometryWrapper transformedGeometry = checkTransformSRS(targetGeometry);
+ return this.preparedGeometry.within(transformedGeometry.xyGeometry);
+ }
+
+ /**
+ *
+ * @return GeometryWrapper as NodeValue
+ */
+ public NodeValue asNodeValue() throws DatatypeFormatException {
+ Literal literal = asLiteral();
+ return NodeValue.makeNode(literal.getLexicalForm(), literal.getDatatype());
+ }
+
+ /**
+ *
+ * @return GeometryWrapper as Node
+ */
+ public Node asNode() throws DatatypeFormatException {
+ return asNodeValue().asNode();
+ }
+
+ /**
+ *
+ * @return GeometryWrapper as Literal
+ */
+ public Literal asLiteral() throws DatatypeFormatException {
+
+ GeometryDatatype datatype = getGeometryDatatype(); //Datatype is only retrieved when required.
+ if (lexicalForm != null) {
+ return ResourceFactory.createTypedLiteral(lexicalForm, datatype);
+ }
+
+ Literal literal = asLiteral(datatype);
+ lexicalForm = literal.getLexicalForm();
+ return literal;
+ }
+
+ /**
+ *
+ * @param outputGeometryDatatypeURI
+ * @return GeometryWrapper as Literal in datatype form.
+ */
+ public Literal asLiteral(String outputGeometryDatatypeURI) throws DatatypeFormatException {
+ GeometryDatatype datatype = GeometryDatatype.get(outputGeometryDatatypeURI);
+ return asLiteral(datatype);
+ }
+
+ /**
+ *
+ * @param datatype
+ * @return GeometryWrapper as Literal
+ */
+ public Literal asLiteral(GeometryDatatype datatype) {
+ String tempLexicalForm = datatype.unparse(this);
+ return ResourceFactory.createTypedLiteral(tempLexicalForm, datatype);
+ }
+
+ /**
+ *
+ * @return Coordinate dimension, i.e. 2 (x,y), 3 (x,y,z or x,y,m) or 4
+ * (x,y,z,m)
+ */
+ public int getCoordinateDimension() {
+ return dimensionInfo.getCoordinate();
+ }
+
+ /**
+ *
+ * @return Spatial dimension, i.e. 2 or 3
+ */
+ public int getSpatialDimension() {
+ return dimensionInfo.getSpatial();
+ }
+
+ /**
+ *
+ * @return Topological dimension, i.e. 0, 1 or 2
+ */
+ public int getTopologicalDimension() {
+ return dimensionInfo.getTopological();
+ }
+
+ /**
+ *
+ * @return Enum of coordinate dimensions.
+ */
+ public CoordinateSequenceDimensions getCoordinateSequenceDimensions() {
+ return dimensionInfo.getDimensions();
+ }
+
+ /**
+ *
+ * @return Units of Measure for the GeometryWrapper SRS.
+ */
+ public UnitsOfMeasure getUnitsOfMeasure() {
+ return srsInfo.getUnitsOfMeasure();
+ }
+
+ /**
+ *
+ * @return GeometryWrapper's coordinate, spatial and topological dimensions.
+ */
+ public DimensionInfo getDimensionInfo() {
+ return dimensionInfo;
+ }
+
+ /**
+ *
+ * @return String literal of Geometry Wrapper.
+ */
+ public String getLexicalForm() {
+
+ if (lexicalForm != null) {
+ return lexicalForm;
+ } else {
+ Literal literal = asLiteral();
+ return literal.getLexicalForm();
+ }
+ }
+
+ /**
+ *
+ * @return Geometry is empty of coordinates.
+ */
+ public boolean isEmpty() {
+ return this.xyGeometry.isEmpty();
+ }
+
+ /**
+ *
+ * @return Geometry is in simple form.
+ */
+ public boolean isSimple() {
+ return this.xyGeometry.isSimple();
+ }
+
+ /**
+ *
+ * @return Geometry is topologically valid.
+ */
+ public boolean isValid() {
+ return this.xyGeometry.isValid();
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param geometryLiteral
+ * @param targetIndex
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(NodeValue geometryLiteral, GeometryIndex targetIndex) {
+
+ Node node = geometryLiteral.asNode();
+
+ return extract(node, targetIndex);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param geometryLiteral
+ * @param targetIndex
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(Node geometryLiteral, GeometryIndex targetIndex) throws DatatypeFormatException {
+
+ if (!geometryLiteral.isLiteral()) {
+ throw new DatatypeFormatException("Not a Literal: " + geometryLiteral);
+ }
+
+ String datatypeURI = geometryLiteral.getLiteralDatatypeURI();
+ String lexicalForm = geometryLiteral.getLiteralLexicalForm();
+ return extract(lexicalForm, datatypeURI, targetIndex);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param geometryLiteral
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(NodeValue geometryLiteral) {
+ return extract(geometryLiteral, GeometryIndex.PRIMARY);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param geometryLiteral
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(Node geometryLiteral) {
+ return extract(geometryLiteral, GeometryIndex.PRIMARY);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal. Returns null if invalid
+ * literal provided.
+ *
+ * @param geometryLiteral
+ * @param targetIndex
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(Literal geometryLiteral, GeometryIndex targetIndex) {
+ return extract(geometryLiteral.getLexicalForm(), geometryLiteral.getDatatypeURI(), targetIndex);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param geometryLiteral
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static final GeometryWrapper extract(Literal geometryLiteral) {
+ return extract(geometryLiteral, GeometryIndex.PRIMARY);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param lexicalForm
+ * @param datatypeURI
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static GeometryWrapper extract(String lexicalForm, String datatypeURI) {
+ return extract(lexicalForm, datatypeURI, GeometryIndex.PRIMARY);
+ }
+
+ /**
+ * Extract Geometry Wrapper from Geometry Literal.
+ *
+ * @param lexicalForm
+ * @param datatypeURI
+ * @param targetIndex
+ * @return Geometry Wrapper of the Geometry Literal.
+ */
+ public static GeometryWrapper extract(String lexicalForm, String datatypeURI, GeometryIndex targetIndex) throws DatatypeFormatException {
+
+ if (lexicalForm == null || datatypeURI == null) {
+ throw new DatatypeFormatException("GeometryWrapper extraction: arguments cannot be null - " + lexicalForm + ", " + datatypeURI);
+ }
+
+ GeometryDatatype datatype = GeometryDatatype.get(datatypeURI);
+ GeometryWrapper geometry = datatype.parse(lexicalForm, targetIndex);
+ return geometry;
+ }
+
+ /**
+ * Builds a WKT Point of Geometry Wrapper.<br>
+ * This method does not use the GeometryLiteralIndex and so is best used for
+ * one of Geometry Wrappers.
+ *
+ * @return Geometry Wrapper of WKT Point.
+ */
+ public static final GeometryWrapper fromPoint(double x, double y, String srsURI) {
+ CustomCoordinateSequence coordSequence = CustomCoordinateSequence.createPoint(x, y);
+ GeometryWrapper geometryWrapper = new GeometryWrapper(coordSequence, WKTDatatype.URI, srsURI);
+ return geometryWrapper;
+ }
+
+ /**
+ *
+ * @return Empty GeometryWrapper in WKT datatype.
+ */
+ public static final GeometryWrapper getEmptyWKT() {
+ return WKTDatatype.INSTANCE.read("");
+ }
+
+ /**
+ *
+ * @return Empty GeometryWrapper in GML datatype.
+ */
+ public static final GeometryWrapper getEmptyGML() {
+ return GMLDatatype.INSTANCE.read("");
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 23 * hash + Objects.hashCode(this.dimensionInfo);
+ hash = 23 * hash + Objects.hashCode(this.srsInfo);
+ hash = 23 * hash + Objects.hashCode(this.xyGeometry);
+ hash = 23 * hash + Objects.hashCode(this.geometryDatatypeURI);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final GeometryWrapper other = (GeometryWrapper) obj;
+ if (!Objects.equals(this.geometryDatatypeURI, other.geometryDatatypeURI)) {
+ return false;
+ }
+ if (!Objects.equals(this.dimensionInfo, other.dimensionInfo)) {
+ return false;
+ }
+ if (!Objects.equals(this.srsInfo, other.srsInfo)) {
+ return false;
+ }
+ return Objects.equals(this.xyGeometry, other.xyGeometry);
+ }
+
+ @Override
+ public String toString() {
+ return "GeometryWrapper{" + "dimensionInfo=" + dimensionInfo + ", geometryDatatypeURI=" + geometryDatatypeURI + ", lexicalForm=" + lexicalForm + ", utmURI=" + utmURI + ", latitude=" + latitude + ", xyGeometry=" + xyGeometry + ", parsingGeometry=" + parsingGeometry + ", preparedGeometry=" + preparedGeometry + ", srsInfo=" + srsInfo + '}';
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsOfMeasure.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsOfMeasure.java
index af9d20f..072d0cc 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsOfMeasure.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/UnitsOfMeasure.java
@@ -1,224 +1,224 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation;
-
-import java.io.Serializable;
-import java.util.Objects;
-import javax.measure.Quantity;
-import javax.measure.Unit;
-import javax.measure.quantity.Length;
-import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
-import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
-import org.apache.sis.measure.Quantities;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-/**
- * Based on:
- * http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html
- * Based on: http://docs.opengeospatial.org/is/12-063r5/12-063r5.html
- *
- * Based on: https://sis.apache.org/apidocs/org/apache/sis/measure/Units.html
- *
- *
- */
-public class UnitsOfMeasure implements Serializable {
-
- private final Unit<Length> unit;
- private final String unitURI;
- private final boolean isLinearUnits;
-
- public static final UnitsOfMeasure METRE_UNITS = new UnitsOfMeasure(Unit_URI.METRE_URL);
- public static final UnitsOfMeasure DEGREE_UNITS = new UnitsOfMeasure(Unit_URI.DEGREE_URL);
-
- //https://en.wikipedia.org/wiki/Decimal_degrees
- public static final double EQUATORIAL_DEGREE_TO_METRES = 111319.8922;
- public static final double EARTH_MEAN_RADIUS = 6371008.7714; //Earth Mean Radius
-
- @SuppressWarnings("unchecked")
- public UnitsOfMeasure(CoordinateReferenceSystem crs) {
- this.unit = (Unit<Length>) crs.getCoordinateSystem().getAxis(0).getUnit();
- this.unitURI = UnitsRegistry.getUnitURI(unit);
- this.isLinearUnits = UnitsRegistry.isLinearUnits(unitURI);
- }
-
- @SuppressWarnings("unchecked")
- public UnitsOfMeasure(String unitURI) {
- this.unit = (Unit<Length>) UnitsRegistry.getUnit(unitURI);
- this.unitURI = UnitsRegistry.getUnitURI(unit);
- this.isLinearUnits = UnitsRegistry.isLinearUnits(unitURI);
- }
-
- public Unit<Length> getUnit() {
- return unit;
- }
-
- public String getUnitURI() {
- return unitURI;
- }
-
- public boolean isLinearUnits() {
- return isLinearUnits;
- }
-
- /**
- * Conversion from target distance in units to source Units Of Measure.
- *
- * @param sourceDistance
- * @param sourceDistanceUnitsURI
- * @param targetDistanceUnitsURI
- * @return Distance after conversion.
- * @throws UnitsConversionException
- */
- public static final Double conversion(double sourceDistance, String sourceDistanceUnitsURI, String targetDistanceUnitsURI) throws UnitsConversionException {
- return conversion(sourceDistance, new UnitsOfMeasure(sourceDistanceUnitsURI), new UnitsOfMeasure(targetDistanceUnitsURI));
- }
-
- /**
- * Conversion from target distance in units to source Units Of Measure.
- *
- * @param sourceDistance
- * @param sourceUnits
- * @param targetUnits
- * @return Distance after conversion.
- * @throws UnitsConversionException
- */
- public static final Double conversion(double sourceDistance, UnitsOfMeasure sourceUnits, UnitsOfMeasure targetUnits) throws UnitsConversionException {
-
- Boolean isSourceUnitsLinear = sourceUnits.isLinearUnits();
- Boolean isTargetUnitsLinear = targetUnits.isLinearUnits();
-
- if (!isSourceUnitsLinear.equals(isTargetUnitsLinear)) {
- throw new UnitsConversionException("Conversion between linear and non-linear units not supported (convertBetween method): " + sourceUnits.unitURI + " and " + targetUnits.unitURI);
- }
-
- //Source and Target are the same units, so return the source distance.
- if (sourceUnits.unitURI.equals(targetUnits.unitURI)) {
- return sourceDistance;
- }
-
- //Find which type of measure for the distance is being used.
- Unit<Length> sourceUnit = sourceUnits.getUnit();
- Unit<Length> targetUnit = targetUnits.getUnit();
-
- Quantity<Length> distance = Quantities.create(sourceDistance, sourceUnit);
- Quantity<Length> targetDistance = distance.to(targetUnit);
-
- return targetDistance.getValue().doubleValue();
-
- }
-
- /**
- * Convert between linear and non-linear units and vice versa.<br>
- * Will convert linear/linear and non-linear/non-linear units.
- *
- * @param distance
- * @param unitsURI
- * @param targetDistanceUnitsURI
- * @param isTargetUnitsLinear
- * @param latitude
- * @return Distance in target units.
- */
- public static final double convertBetween(double distance, String unitsURI, String targetDistanceUnitsURI, boolean isTargetUnitsLinear, double latitude) {
- double targetDistance;
- if (isTargetUnitsLinear) {
- double metresDistance = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
- targetDistance = UnitsOfMeasure.conversion(metresDistance, Unit_URI.METRE_URL, targetDistanceUnitsURI);
- } else {
- double degreesDistance = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
- targetDistance = UnitsOfMeasure.conversion(degreesDistance, Unit_URI.DEGREE_URL, targetDistanceUnitsURI);
- }
-
- return targetDistance;
- }
-
- /**
- * Provides conversion of linear units to degrees.
- * <br> Conversion from linear (i.e. metres) to degrees based on equatorial
- * radius of 111.32km.
- * <br> Therefore, this should only be used for rough bounding area before
- * using more precise distance methods of GeometryWrapper.
- *
- * @param distance
- * @param unitsURI
- * @param latitude
- * @return Converted distance in the provided units.
- */
- public static final double convertToDegrees(double distance, String unitsURI, double latitude) {
-
- UnitsOfMeasure units = new UnitsOfMeasure(unitsURI);
-
- if (units.isLinearUnits()) {
- double latitudeRadians = Math.toRadians(latitude);
- double longitudeRatio = Math.cos(latitudeRadians) * EQUATORIAL_DEGREE_TO_METRES;
- double metreDistance = UnitsOfMeasure.conversion(distance, units, METRE_UNITS);
- return metreDistance / longitudeRatio;
- } else {
- return UnitsOfMeasure.conversion(distance, units, DEGREE_UNITS);
- }
-
- }
-
- public static final double convertToMetres(double distance, String unitsURI, double latitude) {
- UnitsOfMeasure units = new UnitsOfMeasure(unitsURI);
- if (!units.isLinearUnits()) {
- double latitudeRadians = Math.toRadians(latitude);
- double longitudeRatio = Math.cos(latitudeRadians) * EQUATORIAL_DEGREE_TO_METRES;
- double degreeDistance = UnitsOfMeasure.conversion(distance, units, DEGREE_UNITS);
- return degreeDistance * longitudeRatio;
- } else {
- return UnitsOfMeasure.conversion(distance, units, METRE_UNITS);
- }
- }
-
- @Override
- public String toString() {
- return "UnitsOfMeasure{" + "unit=" + unit + ", unitURI=" + unitURI + ", isLinearUnits=" + isLinearUnits + '}';
- }
-
- @Override
- public int hashCode() {
- int hash = 7;
- hash = 71 * hash + Objects.hashCode(this.unit);
- hash = 71 * hash + Objects.hashCode(this.unitURI);
- hash = 71 * hash + (this.isLinearUnits ? 1 : 0);
- return hash;
- }
-
- @Override
- public boolean equals(Object obj
- ) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final UnitsOfMeasure other = (UnitsOfMeasure) obj;
- if (this.isLinearUnits != other.isLinearUnits) {
- return false;
- }
- if (!Objects.equals(this.unitURI, other.unitURI)) {
- return false;
- }
- return Objects.equals(this.unit, other.unit);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation;
+
+import java.io.Serializable;
+import java.util.Objects;
+import javax.measure.Quantity;
+import javax.measure.Unit;
+import javax.measure.quantity.Length;
+import org.apache.jena.geosparql.implementation.registry.UnitsRegistry;
+import org.apache.jena.geosparql.implementation.vocabulary.Unit_URI;
+import org.apache.sis.measure.Quantities;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+/**
+ * Based on:
+ * http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html
+ * Based on: http://docs.opengeospatial.org/is/12-063r5/12-063r5.html
+ *
+ * Based on: https://sis.apache.org/apidocs/org/apache/sis/measure/Units.html
+ *
+ *
+ */
+public class UnitsOfMeasure implements Serializable {
+
+ private final Unit<Length> unit;
+ private final String unitURI;
+ private final boolean isLinearUnits;
+
+ public static final UnitsOfMeasure METRE_UNITS = new UnitsOfMeasure(Unit_URI.METRE_URL);
+ public static final UnitsOfMeasure DEGREE_UNITS = new UnitsOfMeasure(Unit_URI.DEGREE_URL);
+
+ //https://en.wikipedia.org/wiki/Decimal_degrees
+ public static final double EQUATORIAL_DEGREE_TO_METRES = 111319.8922;
+ public static final double EARTH_MEAN_RADIUS = 6371008.7714; //Earth Mean Radius
+
+ @SuppressWarnings("unchecked")
+ public UnitsOfMeasure(CoordinateReferenceSystem crs) {
+ this.unit = (Unit<Length>) crs.getCoordinateSystem().getAxis(0).getUnit();
+ this.unitURI = UnitsRegistry.getUnitURI(unit);
+ this.isLinearUnits = UnitsRegistry.isLinearUnits(unitURI);
+ }
+
+ @SuppressWarnings("unchecked")
+ public UnitsOfMeasure(String unitURI) {
+ this.unit = (Unit<Length>) UnitsRegistry.getUnit(unitURI);
+ this.unitURI = UnitsRegistry.getUnitURI(unit);
+ this.isLinearUnits = UnitsRegistry.isLinearUnits(unitURI);
+ }
+
+ public Unit<Length> getUnit() {
+ return unit;
+ }
+
+ public String getUnitURI() {
+ return unitURI;
+ }
+
+ public boolean isLinearUnits() {
+ return isLinearUnits;
+ }
+
+ /**
+ * Conversion from target distance in units to source Units Of Measure.
+ *
+ * @param sourceDistance
+ * @param sourceDistanceUnitsURI
+ * @param targetDistanceUnitsURI
+ * @return Distance after conversion.
+ * @throws UnitsConversionException
+ */
+ public static final Double conversion(double sourceDistance, String sourceDistanceUnitsURI, String targetDistanceUnitsURI) throws UnitsConversionException {
+ return conversion(sourceDistance, new UnitsOfMeasure(sourceDistanceUnitsURI), new UnitsOfMeasure(targetDistanceUnitsURI));
+ }
+
+ /**
+ * Conversion from target distance in units to source Units Of Measure.
+ *
+ * @param sourceDistance
+ * @param sourceUnits
+ * @param targetUnits
+ * @return Distance after conversion.
+ * @throws UnitsConversionException
+ */
+ public static final Double conversion(double sourceDistance, UnitsOfMeasure sourceUnits, UnitsOfMeasure targetUnits) throws UnitsConversionException {
+
+ Boolean isSourceUnitsLinear = sourceUnits.isLinearUnits();
+ Boolean isTargetUnitsLinear = targetUnits.isLinearUnits();
+
+ if (!isSourceUnitsLinear.equals(isTargetUnitsLinear)) {
+ throw new UnitsConversionException("Conversion between linear and non-linear units not supported (convertBetween method): " + sourceUnits.unitURI + " and " + targetUnits.unitURI);
+ }
+
+ //Source and Target are the same units, so return the source distance.
+ if (sourceUnits.unitURI.equals(targetUnits.unitURI)) {
+ return sourceDistance;
+ }
+
+ //Find which type of measure for the distance is being used.
+ Unit<Length> sourceUnit = sourceUnits.getUnit();
+ Unit<Length> targetUnit = targetUnits.getUnit();
+
+ Quantity<Length> distance = Quantities.create(sourceDistance, sourceUnit);
+ Quantity<Length> targetDistance = distance.to(targetUnit);
+
+ return targetDistance.getValue().doubleValue();
+
+ }
+
+ /**
+ * Convert between linear and non-linear units and vice versa.<br>
+ * Will convert linear/linear and non-linear/non-linear units.
+ *
+ * @param distance
+ * @param unitsURI
+ * @param targetDistanceUnitsURI
+ * @param isTargetUnitsLinear
+ * @param latitude
+ * @return Distance in target units.
+ */
+ public static final double convertBetween(double distance, String unitsURI, String targetDistanceUnitsURI, boolean isTargetUnitsLinear, double latitude) {
+ double targetDistance;
+ if (isTargetUnitsLinear) {
+ double metresDistance = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
+ targetDistance = UnitsOfMeasure.conversion(metresDistance, Unit_URI.METRE_URL, targetDistanceUnitsURI);
+ } else {
+ double degreesDistance = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
+ targetDistance = UnitsOfMeasure.conversion(degreesDistance, Unit_URI.DEGREE_URL, targetDistanceUnitsURI);
+ }
+
+ return targetDistance;
+ }
+
+ /**
+ * Provides conversion of linear units to degrees.
+ * <br> Conversion from linear (i.e. metres) to degrees based on equatorial
+ * radius of 111.32km.
+ * <br> Therefore, this should only be used for rough bounding area before
+ * using more precise distance methods of GeometryWrapper.
+ *
+ * @param distance
+ * @param unitsURI
+ * @param latitude
+ * @return Converted distance in the provided units.
+ */
+ public static final double convertToDegrees(double distance, String unitsURI, double latitude) {
+
+ UnitsOfMeasure units = new UnitsOfMeasure(unitsURI);
+
+ if (units.isLinearUnits()) {
+ double latitudeRadians = Math.toRadians(latitude);
+ double longitudeRatio = Math.cos(latitudeRadians) * EQUATORIAL_DEGREE_TO_METRES;
+ double metreDistance = UnitsOfMeasure.conversion(distance, units, METRE_UNITS);
+ return metreDistance / longitudeRatio;
+ } else {
+ return UnitsOfMeasure.conversion(distance, units, DEGREE_UNITS);
+ }
+
+ }
+
+ public static final double convertToMetres(double distance, String unitsURI, double latitude) {
+ UnitsOfMeasure units = new UnitsOfMeasure(unitsURI);
+ if (!units.isLinearUnits()) {
+ double latitudeRadians = Math.toRadians(latitude);
+ double longitudeRatio = Math.cos(latitudeRadians) * EQUATORIAL_DEGREE_TO_METRES;
+ double degreeDistance = UnitsOfMeasure.conversion(distance, units, DEGREE_UNITS);
+ return degreeDistance * longitudeRatio;
+ } else {
+ return UnitsOfMeasure.conversion(distance, units, METRE_UNITS);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "UnitsOfMeasure{" + "unit=" + unit + ", unitURI=" + unitURI + ", isLinearUnits=" + isLinearUnits + '}';
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 71 * hash + Objects.hashCode(this.unit);
+ hash = 71 * hash + Objects.hashCode(this.unitURI);
+ hash = 71 * hash + (this.isLinearUnits ? 1 : 0);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj
+ ) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final UnitsOfMeasure other = (UnitsOfMeasure) obj;
+ if (this.isLinearUnits != other.isLinearUnits) {
+ return false;
+ }
+ if (!Objects.equals(this.unitURI, other.unitURI)) {
+ return false;
+ }
+ return Objects.equals(this.unit, other.unit);
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
index 762a33a..59fa1d2 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryLiteralIndex.java
@@ -1,162 +1,162 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation.index;
-
-import io.github.galbiston.expiring_map.ExpiringMap;
-import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
-import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
-import java.util.Map;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
-
-/**
- *
- *
- */
-public class GeometryLiteralIndex {
-
- private static boolean INDEX_ACTIVE = false;
- private static final String PRIMARY_INDEX_LABEL = "Primary Geometry Literal Index";
- private static final String SECONDARY_INDEX_LABEL = "Secondary Geometry Literal Index";
- private static ExpiringMap<String, GeometryWrapper> PRIMARY_INDEX = new ExpiringMap<>(PRIMARY_INDEX_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
- private static ExpiringMap<String, GeometryWrapper> SECONDARY_INDEX = new ExpiringMap<>(SECONDARY_INDEX_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
-
- public enum GeometryIndex {
- PRIMARY, SECONDARY
- }
-
- public static final GeometryWrapper retrieve(String geometryLiteral, GeometryDatatype geometryDatatype, GeometryIndex targetIndex) {
- GeometryWrapper geometryWrapper;
-
- switch (targetIndex) {
- case SECONDARY:
- geometryWrapper = retrieveMemoryIndex(geometryLiteral, geometryDatatype, SECONDARY_INDEX, PRIMARY_INDEX);
- break;
- default:
- geometryWrapper = retrieveMemoryIndex(geometryLiteral, geometryDatatype, PRIMARY_INDEX, SECONDARY_INDEX);
- }
-
- return geometryWrapper;
- }
-
- private static GeometryWrapper retrieveMemoryIndex(String geometryLiteral, GeometryDatatype geometryDatatype, Map<String, GeometryWrapper> index, Map<String, GeometryWrapper> otherIndex) {
-
- GeometryWrapper geometryWrapper;
-
- if (INDEX_ACTIVE) {
-
- if (index.containsKey(geometryLiteral)) {
- geometryWrapper = index.get(geometryLiteral);
- } else {
- if (otherIndex.containsKey(geometryLiteral)) {
- geometryWrapper = otherIndex.get(geometryLiteral);
- } else {
- geometryWrapper = geometryDatatype.read(geometryLiteral);
- }
- index.put(geometryLiteral, geometryWrapper);
- }
-
- return geometryWrapper;
- }
-
- return geometryDatatype.read(geometryLiteral);
-
- }
-
- /**
- * Empty the Geometry Literal Index.
- */
- public static final void clear() {
- PRIMARY_INDEX.clear();
- SECONDARY_INDEX.clear();
- }
-
- /**
- * Sets the maximum size of Geometry Literal Index.
- *
- * @param maxSize : use -1 for unlimited size
- */
- public static final void setMaxSize(int maxSize) {
- PRIMARY_INDEX.setMaxSize(maxSize);
- SECONDARY_INDEX.setMaxSize(maxSize);
- }
-
- /**
- * Sets the expiry time in milliseconds of the Geometry Literal Indexes, if
- * active.
- *
- * @param expiryInterval : use 0 or negative for unlimited timeout
- */
- public static final void setExpiry(long expiryInterval) {
- PRIMARY_INDEX.setExpiryInterval(expiryInterval);
- SECONDARY_INDEX.setExpiryInterval(expiryInterval);
- }
-
- /**
- *
- * @return Number of items in the primary index.
- */
- public static final long getPrimaryIndexSize() {
- return PRIMARY_INDEX.mappingCount();
- }
-
- /**
- *
- * @return Number of items in the secondary index.
- */
- public static final long getSecondaryIndexSize() {
- return SECONDARY_INDEX.mappingCount();
- }
-
- /**
- *
- * @return True if index is active.
- */
- public static boolean isIndexActive() {
- return INDEX_ACTIVE;
- }
-
- /**
- * Sets whether the index is active.
- *
- * @param indexActive
- */
- public static void setIndexActive(boolean indexActive) {
- INDEX_ACTIVE = indexActive;
- if (INDEX_ACTIVE) {
- PRIMARY_INDEX.startExpiry();
- SECONDARY_INDEX.startExpiry();
- } else {
- PRIMARY_INDEX.stopExpiry();
- SECONDARY_INDEX.stopExpiry();
- }
- }
-
- /**
- * Reset the indexes to the provided max size and expiry interval.<br>
- * All contents will be lost.
- *
- * @param maxSize
- * @param expiryInterval
- */
- public static void reset(int maxSize, long expiryInterval) {
- PRIMARY_INDEX = new ExpiringMap<>(PRIMARY_INDEX_LABEL, maxSize, expiryInterval);
- SECONDARY_INDEX = new ExpiringMap<>(SECONDARY_INDEX_LABEL, maxSize, expiryInterval);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation.index;
+
+import io.github.galbiston.expiring_map.ExpiringMap;
+import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
+import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.Map;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.datatype.GeometryDatatype;
+
+/**
+ *
+ *
+ */
+public class GeometryLiteralIndex {
+
+ private static boolean INDEX_ACTIVE = false;
+ private static final String PRIMARY_INDEX_LABEL = "Primary Geometry Literal Index";
+ private static final String SECONDARY_INDEX_LABEL = "Secondary Geometry Literal Index";
+ private static ExpiringMap<String, GeometryWrapper> PRIMARY_INDEX = new ExpiringMap<>(PRIMARY_INDEX_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
+ private static ExpiringMap<String, GeometryWrapper> SECONDARY_INDEX = new ExpiringMap<>(SECONDARY_INDEX_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
+
+ public enum GeometryIndex {
+ PRIMARY, SECONDARY
+ }
+
+ public static final GeometryWrapper retrieve(String geometryLiteral, GeometryDatatype geometryDatatype, GeometryIndex targetIndex) {
+ GeometryWrapper geometryWrapper;
+
+ switch (targetIndex) {
+ case SECONDARY:
+ geometryWrapper = retrieveMemoryIndex(geometryLiteral, geometryDatatype, SECONDARY_INDEX, PRIMARY_INDEX);
+ break;
+ default:
+ geometryWrapper = retrieveMemoryIndex(geometryLiteral, geometryDatatype, PRIMARY_INDEX, SECONDARY_INDEX);
+ }
+
+ return geometryWrapper;
+ }
+
+ private static GeometryWrapper retrieveMemoryIndex(String geometryLiteral, GeometryDatatype geometryDatatype, Map<String, GeometryWrapper> index, Map<String, GeometryWrapper> otherIndex) {
+
+ GeometryWrapper geometryWrapper;
+
+ if (INDEX_ACTIVE) {
+
+ if (index.containsKey(geometryLiteral)) {
+ geometryWrapper = index.get(geometryLiteral);
+ } else {
+ if (otherIndex.containsKey(geometryLiteral)) {
+ geometryWrapper = otherIndex.get(geometryLiteral);
+ } else {
+ geometryWrapper = geometryDatatype.read(geometryLiteral);
+ }
+ index.put(geometryLiteral, geometryWrapper);
+ }
+
+ return geometryWrapper;
+ }
+
+ return geometryDatatype.read(geometryLiteral);
+
+ }
+
+ /**
+ * Empty the Geometry Literal Index.
+ */
+ public static final void clear() {
+ PRIMARY_INDEX.clear();
+ SECONDARY_INDEX.clear();
+ }
+
+ /**
+ * Sets the maximum size of Geometry Literal Index.
+ *
+ * @param maxSize : use -1 for unlimited size
+ */
+ public static final void setMaxSize(int maxSize) {
+ PRIMARY_INDEX.setMaxSize(maxSize);
+ SECONDARY_INDEX.setMaxSize(maxSize);
+ }
+
+ /**
+ * Sets the expiry time in milliseconds of the Geometry Literal Indexes, if
+ * active.
+ *
+ * @param expiryInterval : use 0 or negative for unlimited timeout
+ */
+ public static final void setExpiry(long expiryInterval) {
+ PRIMARY_INDEX.setExpiryInterval(expiryInterval);
+ SECONDARY_INDEX.setExpiryInterval(expiryInterval);
+ }
+
+ /**
+ *
+ * @return Number of items in the primary index.
+ */
+ public static final long getPrimaryIndexSize() {
+ return PRIMARY_INDEX.mappingCount();
+ }
+
+ /**
+ *
+ * @return Number of items in the secondary index.
+ */
+ public static final long getSecondaryIndexSize() {
+ return SECONDARY_INDEX.mappingCount();
+ }
+
+ /**
+ *
+ * @return True if index is active.
+ */
+ public static boolean isIndexActive() {
+ return INDEX_ACTIVE;
+ }
+
+ /**
+ * Sets whether the index is active.
+ *
+ * @param indexActive
+ */
+ public static void setIndexActive(boolean indexActive) {
+ INDEX_ACTIVE = indexActive;
+ if (INDEX_ACTIVE) {
+ PRIMARY_INDEX.startExpiry();
+ SECONDARY_INDEX.startExpiry();
+ } else {
+ PRIMARY_INDEX.stopExpiry();
+ SECONDARY_INDEX.stopExpiry();
+ }
+ }
+
+ /**
+ * Reset the indexes to the provided max size and expiry interval.<br>
+ * All contents will be lost.
+ *
+ * @param maxSize
+ * @param expiryInterval
+ */
+ public static void reset(int maxSize, long expiryInterval) {
+ PRIMARY_INDEX = new ExpiringMap<>(PRIMARY_INDEX_LABEL, maxSize, expiryInterval);
+ SECONDARY_INDEX = new ExpiringMap<>(SECONDARY_INDEX_LABEL, maxSize, expiryInterval);
+ }
+
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryTransformIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryTransformIndex.java
index ebc1071..b13b3d7 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryTransformIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/GeometryTransformIndex.java
@@ -1,159 +1,159 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation.index;
-
-import io.github.galbiston.expiring_map.ExpiringMap;
-import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
-import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
-import org.apache.jena.geosparql.implementation.DimensionInfo;
-import org.apache.jena.geosparql.implementation.GeometryWrapper;
-import org.apache.jena.geosparql.implementation.jts.GeometryTransformation;
-import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
-import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
-import org.locationtech.jts.geom.Geometry;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
-
-/**
- *
- *
- */
-public class GeometryTransformIndex {
-
- private static boolean INDEX_ACTIVE = false;
- private static final String GEOMETRY_TRANSFORM_LABEL = "Geometry Transform";
- private static ExpiringMap<String, GeometryWrapper> GEOMETRY_TRANSFORM_INDEX = new ExpiringMap<>(GEOMETRY_TRANSFORM_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
-
- /**
- *
- * @param sourceGeometryWrapper
- * @param srsURI
- * @param storeSRSTransform
- * @return GeometryWrapper following transformation.
- * @throws TransformException
- * @throws org.opengis.util.FactoryException
- */
- public static final GeometryWrapper transform(GeometryWrapper sourceGeometryWrapper, String srsURI, Boolean storeSRSTransform) throws TransformException, FactoryException {
-
- GeometryWrapper transformedGeometryWrapper;
- String key = sourceGeometryWrapper.getLexicalForm() + "@" + srsURI;
-
- if (INDEX_ACTIVE && storeSRSTransform) {
- try {
- if (GEOMETRY_TRANSFORM_INDEX.containsKey(key)) {
-
- transformedGeometryWrapper = GEOMETRY_TRANSFORM_INDEX.get(key);
-
- } else {
- transformedGeometryWrapper = transform(sourceGeometryWrapper, srsURI);
- GEOMETRY_TRANSFORM_INDEX.put(key, transformedGeometryWrapper);
- }
- return transformedGeometryWrapper;
- } catch (NullPointerException ex) {
- //Catch NullPointerException and fall through to default action.
- }
- }
- return transform(sourceGeometryWrapper, srsURI);
-
- }
-
- private static GeometryWrapper transform(GeometryWrapper sourceGeometryWrapper, String srsURI) throws MismatchedDimensionException, FactoryException, TransformException {
- CoordinateReferenceSystem sourceCRS = sourceGeometryWrapper.getCRS();
- CoordinateReferenceSystem targetCRS = SRSRegistry.getCRS(srsURI);
- MathTransform transform = MathTransformRegistry.getMathTransform(sourceCRS, targetCRS);
- Geometry parsingGeometry = sourceGeometryWrapper.getParsingGeometry();
-
- //Transform the coordinates into a new Geometry.
- Geometry transformedGeometry = GeometryTransformation.transform(parsingGeometry, transform);
-
- //Construct a new GeometryWrapper using info from original GeometryWrapper.
- String geometryDatatypeURI = sourceGeometryWrapper.getGeometryDatatypeURI();
- DimensionInfo dimensionInfo = sourceGeometryWrapper.getDimensionInfo();
- return new GeometryWrapper(transformedGeometry, srsURI, geometryDatatypeURI, dimensionInfo);
- }
-
- /**
- * Empty the Geometry Transform Index.
- */
- public static final void clear() {
- GEOMETRY_TRANSFORM_INDEX.clear();
- }
-
- /**
- * Sets whether the maximum size of the Geometry Transform Index.
- *
- * @param maxSize : use -1 for unlimited size
- */
- public static final void setMaxSize(int maxSize) {
- GEOMETRY_TRANSFORM_INDEX.setMaxSize(maxSize);
- }
-
- /**
- * Sets the expiry time in milliseconds of the Geometry Transform Index, if
- * active.
- *
- * @param expiryInterval : use 0 or negative for unlimited timeout
- */
- public static final void setExpiry(long expiryInterval) {
- GEOMETRY_TRANSFORM_INDEX.setExpiryInterval(expiryInterval);
- }
-
- /**
- *
- * @return Number of items in the index.
- */
- public static final long getGeometryTransformIndexSize() {
- return GEOMETRY_TRANSFORM_INDEX.mappingCount();
- }
-
- /**
- *
- * @return True if index is active.
- */
- public static boolean isIndexActive() {
- return INDEX_ACTIVE;
- }
-
- /**
- * Sets whether the index is active.
- *
- * @param indexActive
- */
- public static void setIndexActive(boolean indexActive) {
- INDEX_ACTIVE = indexActive;
- if (INDEX_ACTIVE) {
- GEOMETRY_TRANSFORM_INDEX.startExpiry();
- } else {
- GEOMETRY_TRANSFORM_INDEX.stopExpiry();
- }
- }
-
- /**
- * Reset the index to the provided max size and expiry interval.<br>
- * All contents will be lost.
- *
- * @param maxSize
- * @param expiryInterval
- */
- public static void reset(int maxSize, long expiryInterval) {
- GEOMETRY_TRANSFORM_INDEX = new ExpiringMap<>(GEOMETRY_TRANSFORM_LABEL, maxSize, expiryInterval);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation.index;
+
+import io.github.galbiston.expiring_map.ExpiringMap;
+import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
+import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import org.apache.jena.geosparql.implementation.DimensionInfo;
+import org.apache.jena.geosparql.implementation.GeometryWrapper;
+import org.apache.jena.geosparql.implementation.jts.GeometryTransformation;
+import org.apache.jena.geosparql.implementation.registry.MathTransformRegistry;
+import org.apache.jena.geosparql.implementation.registry.SRSRegistry;
+import org.locationtech.jts.geom.Geometry;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+
+/**
+ *
+ *
+ */
+public class GeometryTransformIndex {
+
+ private static boolean INDEX_ACTIVE = false;
+ private static final String GEOMETRY_TRANSFORM_LABEL = "Geometry Transform";
+ private static ExpiringMap<String, GeometryWrapper> GEOMETRY_TRANSFORM_INDEX = new ExpiringMap<>(GEOMETRY_TRANSFORM_LABEL, UNLIMITED_MAP, MAP_EXPIRY_INTERVAL);
+
+ /**
+ *
+ * @param sourceGeometryWrapper
+ * @param srsURI
+ * @param storeSRSTransform
+ * @return GeometryWrapper following transformation.
+ * @throws TransformException
+ * @throws org.opengis.util.FactoryException
+ */
+ public static final GeometryWrapper transform(GeometryWrapper sourceGeometryWrapper, String srsURI, Boolean storeSRSTransform) throws TransformException, FactoryException {
+
+ GeometryWrapper transformedGeometryWrapper;
+ String key = sourceGeometryWrapper.getLexicalForm() + "@" + srsURI;
+
+ if (INDEX_ACTIVE && storeSRSTransform) {
+ try {
+ if (GEOMETRY_TRANSFORM_INDEX.containsKey(key)) {
+
+ transformedGeometryWrapper = GEOMETRY_TRANSFORM_INDEX.get(key);
+
+ } else {
+ transformedGeometryWrapper = transform(sourceGeometryWrapper, srsURI);
+ GEOMETRY_TRANSFORM_INDEX.put(key, transformedGeometryWrapper);
+ }
+ return transformedGeometryWrapper;
+ } catch (NullPointerException ex) {
+ //Catch NullPointerException and fall through to default action.
+ }
+ }
+ return transform(sourceGeometryWrapper, srsURI);
+
+ }
+
+ private static GeometryWrapper transform(GeometryWrapper sourceGeometryWrapper, String srsURI) throws MismatchedDimensionException, FactoryException, TransformException {
+ CoordinateReferenceSystem sourceCRS = sourceGeometryWrapper.getCRS();
+ CoordinateReferenceSystem targetCRS = SRSRegistry.getCRS(srsURI);
+ MathTransform transform = MathTransformRegistry.getMathTransform(sourceCRS, targetCRS);
+ Geometry parsingGeometry = sourceGeometryWrapper.getParsingGeometry();
+
+ //Transform the coordinates into a new Geometry.
+ Geometry transformedGeometry = GeometryTransformation.transform(parsingGeometry, transform);
+
+ //Construct a new GeometryWrapper using info from original GeometryWrapper.
+ String geometryDatatypeURI = sourceGeometryWrapper.getGeometryDatatypeURI();
+ DimensionInfo dimensionInfo = sourceGeometryWrapper.getDimensionInfo();
+ return new GeometryWrapper(transformedGeometry, srsURI, geometryDatatypeURI, dimensionInfo);
+ }
+
+ /**
+ * Empty the Geometry Transform Index.
+ */
+ public static final void clear() {
+ GEOMETRY_TRANSFORM_INDEX.clear();
+ }
+
+ /**
+ * Sets whether the maximum size of the Geometry Transform Index.
+ *
+ * @param maxSize : use -1 for unlimited size
+ */
+ public static final void setMaxSize(int maxSize) {
+ GEOMETRY_TRANSFORM_INDEX.setMaxSize(maxSize);
+ }
+
+ /**
+ * Sets the expiry time in milliseconds of the Geometry Transform Index, if
+ * active.
+ *
+ * @param expiryInterval : use 0 or negative for unlimited timeout
+ */
+ public static final void setExpiry(long expiryInterval) {
+ GEOMETRY_TRANSFORM_INDEX.setExpiryInterval(expiryInterval);
+ }
+
+ /**
+ *
+ * @return Number of items in the index.
+ */
+ public static final long getGeometryTransformIndexSize() {
+ return GEOMETRY_TRANSFORM_INDEX.mappingCount();
+ }
+
+ /**
+ *
+ * @return True if index is active.
+ */
+ public static boolean isIndexActive() {
+ return INDEX_ACTIVE;
+ }
+
+ /**
+ * Sets whether the index is active.
+ *
+ * @param indexActive
+ */
+ public static void setIndexActive(boolean indexActive) {
+ INDEX_ACTIVE = indexActive;
+ if (INDEX_ACTIVE) {
+ GEOMETRY_TRANSFORM_INDEX.startExpiry();
+ } else {
+ GEOMETRY_TRANSFORM_INDEX.stopExpiry();
+ }
+ }
+
+ /**
+ * Reset the index to the provided max size and expiry interval.<br>
+ * All contents will be lost.
+ *
+ * @param maxSize
+ * @param expiryInterval
+ */
+ public static void reset(int maxSize, long expiryInterval) {
+ GEOMETRY_TRANSFORM_INDEX = new ExpiringMap<>(GEOMETRY_TRANSFORM_LABEL, maxSize, expiryInterval);
+ }
+}
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/QueryRewriteIndex.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/QueryRewriteIndex.java
index 915a555..cc19ace 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/QueryRewriteIndex.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/implementation/index/QueryRewriteIndex.java
@@ -1,301 +1,301 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jena.geosparql.implementation.index;
-
-import io.github.galbiston.expiring_map.ExpiringMap;
-import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
-import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
-import java.util.Map.Entry;
-import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
-import org.apache.jena.geosparql.geo.topological.GenericPropertyFunction;
-import org.apache.jena.graph.Node;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.DatasetFactory;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.sparql.engine.ExecutionContext;
-import org.apache.jena.sparql.util.Context;
-import org.apache.jena.sparql.util.Symbol;
-
-/**
- *
- */
-public class QueryRewriteIndex {
-
- private boolean indexActive;
- private final String queryRewriteLabel;
- private ExpiringMap<String, Boolean> index;
- private static String LABEL_DEFAULT = "Query Rewrite";
- private static int MAP_SIZE_DEFAULT = UNLIMITED_MAP;
- private static long MAP_EXPIRY_INTERVAL_DEFAULT = MAP_EXPIRY_INTERVAL;
- private static final String KEY_SEPARATOR = "@";
-
- public static final Symbol QUERY_REWRITE_INDEX_SYMBOL = Symbol.create("http://jena.apache.org/spatial#query-index");
-
- public QueryRewriteIndex() {
- this.queryRewriteLabel = LABEL_DEFAULT;
- this.indexActive = GeoSPARQLConfig.isQueryRewriteEnabled();
- this.index = new ExpiringMap<>(queryRewriteLabel, MAP_SIZE_DEFAULT, MAP_EXPIRY_INTERVAL_DEFAULT);
- if (indexActive) {
- index.startExpiry();
- }
- }
-
- public QueryRewriteIndex(String queryRewriteLabel, int maxSize, long expiryInterval) {
- this.queryRewriteLabel = queryRewriteLabel;
- this.indexActive = true;
- this.index = new ExpiringMap<>(queryRewriteLabel, maxSize, expiryInterval);
- this.index.startExpiry();
- }
-
- /**
- *
- * @param subjectGeometryLiteral
- * @param predicate
- * @param objectGeometryLiteral
- * @param propertyFunction
- * @return Result of relation between subject and object.
- */
- public final Boolean test(Node subjectGeometryLiteral, Property predicate, Node objectGeometryLiteral, GenericPropertyFunction propertyFunction) {
-
- if (!subjectGeometryLiteral.isLiteral() || !objectGeometryLiteral.isLiteral()) {
- return false;
- }
-
- if (indexActive) {
- String key = subjectGeometryLiteral.getLiteralLexicalForm() + KEY_SEPARATOR + predicate.getURI() + KEY_SEPARATOR + objectGeometryLiteral.getLiteralLexicalForm();
- try {
- Boolean result;
- if (index.containsKey(key)) {
- result = index.get(key);
- } else {
- result = propertyFunction.testFilterFunction(subjectGeometryLiteral, objectGeometryLiteral);
- index.put(key, result);
- }
- return result;
- } catch (NullPointerException ex) {
- //Catch NullPointerException and fall through to default action.
- }
- }
-
- return propertyFunction.testFilterFunction(subjectGeometryLiteral, objectGeometryLiteral);
- }
-
- /**
- * Empty the index.
- */
- public final void clear() {
- index.clear();
- }
-
- /**
- * Sets whether the Query Rewrite Index is active.
- * <br> The index will be empty after this process.
- *
- * @param maxSize : use -1 for unlimited size
- */
- public final void setMapSize(int maxSize) {
- index.setMaxSize(maxSize);
- }
-
- /**
- * Sets the expiry time in milliseconds of the Query Rewrite Index, if
- * active.
- *
- * @param expiryInterval : use 0 or negative for unlimited timeout
- */
- public final void setMapExpiry(long expiryInterval) {
- index.setExpiryInterval(expiryInterval);
- }
-
- /**
- *
- * @return True if index is active.
- */
- public boolean isIndexActive() {
- return indexActive;
- }
-
- /**
- * COnverts the index to a model of asserted spatial relation statements.
- *
- * @return Model containing all true assertions.
- */
- public Model toModel() {
- Model model = ModelFactory.createDefaultModel();
- for (Entry<String, Boolean> entry : index.entrySet()) {
- Boolean value = entry.getValue();
- if (value) {
- String[] parts = entry.getKey().split(KEY_SEPARATOR);
- Resource subject = ResourceFactory.createResource(parts[0]);
- Property property = ResourceFactory.createProperty(parts[1]);
- Resource object = ResourceFactory.createResource(parts[2]);
- model.add(subject, property, object);
- }
- }
-
- return model;
- }
-
- /**
- * Sets whether the index is active.
- *
- * @param indexActive
- */
- public final void setActive(boolean indexActive) {
- this.indexActive = indexActive;
-
- if (indexActive) {
- index.startExpiry();
- } else {
- index.stopExpiry();
- }
- }
-
- /**
- *
- * @return Number of items in the index.
- */
- public final long getIndexSize() {
- return index.mappingCount();
- }
-
- /**
- * Reset the index to the provided max size and expiry interval.<br>
- * All contents will be lost.
- *
- * @param maxSize
- * @param expiryInterval
- */
- public void reset(int maxSize, long expiryInterval) {
- index = new ExpiringMap<>(queryRewriteLabel, maxSize, expiryInterval);
- }
-
- /**
- * Set the maximum default size of QueryRewriteIndexes. -1 for no limit, 0
- * for no storage.
- *
- * @param mapSizeDefault
- */
- public static final void setMaxSize(int mapSizeDefault) {
- QueryRewriteIndex.MAP_SIZE_DEFAULT = mapSizeDefault;
- }
-
- /**
- * Set the maximum default expiry interval in millisecond of
- * QueryRewriteIndexes. 0 for no expiry.
- *
- * @param mapExpiryIntervalDefault
- */
- public static final void setExpiry(long mapExpiryIntervalDefault) {
- QueryRewriteIndex.MAP_EXPIRY_INTERVAL_DEFAULT = mapExpiryIntervalDefault;
- }
-
- /**
- * Create QueryRewriteIndex using the default global settings.
- *
- * @return Query Rewrite Index using default global settings.
- */
- public static final QueryRewriteIndex createDefault() {
- return new QueryRewriteIndex();
- }
-
- /**
- * Prepare a Dataset with the default QueryRewriteIndex settings.
- *
- * @param dataset
- */
- public static final void prepare(Dataset dataset) {
- Context context = dataset.getContext();
- context.set(QUERY_REWRITE_INDEX_SYMBOL, createDefault());
- }
-
- /**
- * Prepare a Dataset with the provided QueryRewriteIndex settings.
- *
- * @param dataset
- * @param queryRewriteLabel
- * @param maxSize
- * @param expiryInterval
- */
- public static final void prepare(Dataset dataset, String queryRewriteLabel, int maxSize, long expiryInterval) {
- Context context = dataset.getContext();
- context.set(QUERY_REWRITE_INDEX_SYMBOL, new QueryRewriteIndex(queryRewriteLabel, maxSize, expiryInterval));
- }
-
- /**
- * Retrieve the QueryRewriteIndex from the Context.<br>
- * If no index has been setup then QueryRewriteIndex is created.
- *
- * @param execCxt
- * @return QueryRewriteIndex contained in the Context.
- */
- public static final QueryRewriteIndex retrieve(ExecutionContext execCxt) {
-
- Context context = execCxt.getContext();
- return retrieve(context);
- }
-
- /**
- * Retrieve the QueryRewriteIndex from the Dataset Context.<br>
- * If no index has been setup then QueryRewriteIndex is created.
- *
- * @param dataset
- * @return QueryRewriteIndex contained in the Context.
- */
- public static final QueryRewriteIndex retrieve(Dataset dataset) {
-
- Context context = dataset.getContext();
- return retrieve(context);
- }
-
- /**
- * Retrieve the QueryRewriteIndex from the Dataset Context.<br>
- * If no index has been setup then QueryRewriteIndex is created.
- *
- * @param context
- * @return QueryRewriteIndex contained in the Context.
- */
- public static final QueryRewriteIndex retrieve(Context context) {
- QueryRewriteIndex queryRewriteIndex = (QueryRewriteIndex) context.get(QUERY_REWRITE_INDEX_SYMBOL, null);
-
- if (queryRewriteIndex == null) {
- queryRewriteIndex = createDefault();
- context.set(QUERY_REWRITE_INDEX_SYMBOL, queryRewriteIndex);
- }
-
- return queryRewriteIndex;
- }
-
- /**
- * Wrap Model in a Dataset and include QueryRewriteIndex.
- *
- * @param model
- * @return Dataset with default Model and QueryRewriteIndex in Context.
- */
- public static final Dataset wrapModel(Model model) {
- Dataset dataset = DatasetFactory.createTxnMem();
- dataset.setDefaultModel(model);
- prepare(dataset);
-
- return dataset;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.geosparql.implementation.index;
+
+import io.github.galbiston.expiring_map.ExpiringMap;
+import static io.github.galbiston.expiring_map.MapDefaultValues.MAP_EXPIRY_INTERVAL;
+import static io.github.galbiston.expiring_map.MapDefaultValues.UNLIMITED_MAP;
+import java.util.Map.Entry;
+import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.geo.topological.GenericPropertyFunction;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.sparql.engine.ExecutionContext;
+import org.apache.jena.sparql.util.Context;
+import org.apache.jena.sparql.util.Symbol;
+
+/**
+ *
+ */
+public class QueryRewriteIndex {
+
+ private boolean indexActive;
+ private final String queryRewriteLabel;
+ private ExpiringMap<String, Boolean> index;
+ private static String LABEL_DEFAULT = "Query Rewrite";
+ private static int MAP_SIZE_DEFAULT = UNLIMITED_MAP;
+ private static long MAP_EXPIRY_INTERVAL_DEFAULT = MAP_EXPIRY_INTERVAL;
+ private static final String KEY_SEPARATOR = "@";
+
+ public static final Symbol QUERY_REWRITE_INDEX_SYMBOL = Symbol.create("http://jena.apache.org/spatial#query-index");
+
+ public QueryRewriteIndex() {
+ this.queryRewriteLabel = LABEL_DEFAULT;
+ this.indexActive = GeoSPARQLConfig.isQueryRewriteEnabled();
+ this.index = new ExpiringMap<>(queryRewriteLabel, MAP_SIZE_DEFAULT, MAP_EXPIRY_INTERVAL_DEFAULT);
+ if (indexActive) {
+ index.startExpiry();
+ }
+ }
+
+ public QueryRewriteIndex(String queryRewriteLabel, int maxSize, long expiryInterval) {
+ this.queryRewriteLabel = queryRewriteLabel;
+ this.indexActive = true;
+ this.index = new ExpiringMap<>(queryRewriteLabel, maxSize, expiryInterval);
+ this.index.startExpiry();
+ }
+
+ /**
+ *
+ * @param subjectGeometryLiteral
+ * @param predicate
+ * @param objectGeometryLiteral
+ * @param propertyFunction
+ * @return Result of relation between subject and object.
+ */
+ public final Boolean test(Node subjectGeometryLiteral, Property predicate, Node objectGeometryLiteral, GenericPropertyFunction propertyFunction) {
+
+ if (!subjectGeometryLiteral.isLiteral() || !objectGeometryLiteral.isLiteral()) {
+ return false;
+ }
+
+ if (indexActive) {
+ String key = subjectGeometryLiteral.getLiteralLexicalForm() + KEY_SEPARATOR + predicate.getURI() + KEY_SEPARATOR + objectGeometryLiteral.getLiteralLexicalForm();
+ try {
+ Boolean result;
+ if (index.containsKey(key)) {
+ result = index.get(key);
+ } else {
+ result = propertyFunction.testFilterFunction(subjectGeometryLiteral, objectGeometryLiteral);
+ index.put(key, result);
+ }
+ return result;
+ } catch (NullPointerException ex) {
+ //Catch NullPointerException and fall through to default action.
+ }
+ }
+
+ return propertyFunction.testFilterFunction(subjectGeometryLiteral, objectGeometryLiteral);
+ }
+
+ /**
+ * Empty the index.
+ */
+ public final void clear() {
+ index.clear();
+ }
+
+ /**
+ * Sets whether the Query Rewrite Index is active.
+ * <br> The index will be empty after this process.
+ *
+ * @param maxSize : use -1 for unlimited size
+ */
+ public final void setMapSize(int maxSize) {
+ index.setMaxSize(maxSize);
+ }
+
+ /**
+ * Sets the expiry time in milliseconds of the Query Rewrite Index, if
+ * active.
+ *
+ * @param expiryInterval : use 0 or negative for unlimited timeout
+ */
+ public final void setMapExpiry(long expiryInterval) {
+ index.setExpiryInterval(expiryInterval);
+ }
+
+ /**
+ *
+ * @return True if index is active.
+ */
+ public boolean isIndexActive() {
+ return indexActive;
+ }
+
+ /**
+ * COnverts the index to a model of asserted spatial relation statements.
+ *
+ * @return Model containing all true assertions.
+ */
+ public Model toModel() {
+ Model model = ModelFactory.createDefaultModel();
+ for (Entry<String, Boolean> entry : index.entrySet()) {
+ Boolean value = entry.getValue();
+ if (value) {
+ String[] parts = entry.getKey().split(KEY_SEPARATOR);
+ Resource subject = ResourceFactory.createResource(parts[0]);
+ Property property = ResourceFactory.createProperty(parts[1]);
+ Resource object = ResourceFactory.createResource(parts[2]);
+ model.add(subject, property, object);
+ }
+ }
+
+ return model;
+ }
+
+ /**
+ * Sets whether the index is active.
+ *
+ * @param indexActive
+ */
+ public final void setActive(boolean indexActive) {
+ this.indexActive = indexActive;
+
+ if (indexActive) {
+ index.startExpiry();
+ } else {
+ index.stopExpiry();
+ }
+ }
+
+ /**
+ *
+ * @return Number of items in the index.
+ */
+ public final long getIndexSize() {
+ return index.mappingCount();
+ }
+
+ /**
+ * Reset the index to the provided max size and expiry interval.<br>
+ * All contents will be lost.
+ *
+ * @param maxSize
+ * @param expiryInterval
+ */
+ public void reset(int maxSize, long expiryInterval) {
+ index = new ExpiringMap<>(queryRewriteLabel, maxSize, expiryInterval);
+ }
+
+ /**
... 38630 lines suppressed ...