提交 c98088c7 authored 作者: Thomas Mueller's avatar Thomas Mueller

Merge pull request #226 from ebocher/updateJTS

Update JTS
...@@ -1434,13 +1434,13 @@ H2 supports the geometry data type and spatial indexes if ...@@ -1434,13 +1434,13 @@ H2 supports the geometry data type and spatial indexes if
the <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> the <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a>
is in the classpath. is in the classpath.
To run the H2 Console tool with the JTS tool, you need to download the To run the H2 Console tool with the JTS tool, you need to download the
<a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts/1.13/jts-1.13.jar">JTS 1.13 jar file</a> <a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts-core/1.14.0/jts-core-1.14.0.jar">JTS-CORE 1.14.0 jar file</a>
and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows: and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows:
</p> </p>
<pre> <pre>
#!/bin/sh #!/bin/sh
dir=$(dirname "$0") dir=$(dirname "$0")
java -cp "$dir/h2.jar:jts-1.13.jar:$H2DRIVERS:$CLASSPATH" org.h2.tools.Console "$@" java -cp "$dir/h2.jar:jts-core-1.14.0.jar:$H2DRIVERS:$CLASSPATH" org.h2.tools.Console "$@"
</pre> </pre>
<p> <p>
Here is an example SQL script to create a table with a spatial column and index: Here is an example SQL script to create a table with a spatial column and index:
......
...@@ -1064,7 +1064,7 @@ Probability of Duplicates ...@@ -1064,7 +1064,7 @@ Probability of Duplicates
Spatial Features Spatial Features
@advanced_1355_p @advanced_1355_p
H2 supports the geometry data type and spatial indexes if the <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts/1.13/jts-1.13.jar">JTS 1.13 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows: H2 supports the geometry data type and spatial indexes if the <a href="http://tsusiatsoftware.net/x/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts-core/1.14.0/jts-core-1.14.0.jar">JTS-CORE 1.14.0 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows:
@advanced_1356_p @advanced_1356_p
Here is an example SQL script to create a table with a spatial column and index: Here is an example SQL script to create a table with a spatial column and index:
......
@advanced_1000_h1 @advanced_1000_h1
#Advanced #Advanced
@advanced_1001_a @advanced_1001_a
...@@ -1064,7 +1064,7 @@ HTTPS 接続 ...@@ -1064,7 +1064,7 @@ HTTPS 接続
#Spatial Features #Spatial Features
@advanced_1355_p @advanced_1355_p
# H2 supports the geometry data type and spatial indexes if the <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts/1.13/jts-1.13.jar">JTS 1.13 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows: # H2 supports the geometry data type and spatial indexes if the <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href="http://search.maven.org/remotecontent?filepath=com/vividsolutions/jts-core/1.14.0/jts-core-1.14.0.jar">JTS-CORE 1.14.0 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows:
@advanced_1356_p @advanced_1356_p
# Here is an example SQL script to create a table with a spatial column and index: # Here is an example SQL script to create a table with a spatial column and index:
......
...@@ -353,7 +353,7 @@ advanced_1351_td=2^46\=70'368'744'177'664 ...@@ -353,7 +353,7 @@ advanced_1351_td=2^46\=70'368'744'177'664
advanced_1352_td=0.000'000'000'4 advanced_1352_td=0.000'000'000'4
advanced_1353_p=\ To help non-mathematicians understand what those numbers mean, here a comparison\: one's annual risk of being hit by a meteorite is estimated to be one chance in 17 billion, that means the probability is about 0.000'000'000'06. advanced_1353_p=\ To help non-mathematicians understand what those numbers mean, here a comparison\: one's annual risk of being hit by a meteorite is estimated to be one chance in 17 billion, that means the probability is about 0.000'000'000'06.
advanced_1354_h2=Spatial Features advanced_1354_h2=Spatial Features
advanced_1355_p=\ H2 supports the geometry data type and spatial indexes if the <a href\="http\://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href\="http\://search.maven.org/remotecontent?filepath\=com/vividsolutions/jts/1.13/jts-1.13.jar">JTS 1.13 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows\: advanced_1355_p=\ H2 supports the geometry data type and spatial indexes if the <a href\="http\://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a> is in the classpath. To run the H2 Console tool with the JTS tool, you need to download the <a href\="http\://search.maven.org/remotecontent?filepath\=com/vividsolutions/jts-core/1.14.0/jts-core-1.14.0.jar">JTS-CORE 1.14.0 jar file</a> and place it in the h2 bin directory. Then edit the <code>h2.sh</code> file as follows\:
advanced_1356_p=\ Here is an example SQL script to create a table with a spatial column and index\: advanced_1356_p=\ Here is an example SQL script to create a table with a spatial column and index\:
advanced_1357_p=\ To query the table using geometry envelope intersection, use the operation <code>&&</code>, as in PostGIS\: advanced_1357_p=\ To query the table using geometry envelope intersection, use the operation <code>&&</code>, as in PostGIS\:
advanced_1358_p=\ You can verify that the spatial index is used using the "explain plan" feature\: advanced_1358_p=\ You can verify that the spatial index is used using the "explain plan" feature\:
......
...@@ -31,8 +31,8 @@ Import-Package: javax.management, ...@@ -31,8 +31,8 @@ Import-Package: javax.management,
org.apache.lucene.search;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.search;version="[3.0.0,3.1.0)";resolution:=optional,
org.apache.lucene.store;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.store;version="[3.0.0,3.1.0)";resolution:=optional,
org.apache.lucene.util;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.util;version="[3.0.0,3.1.0)";resolution:=optional,
com.vividsolutions.jts.geom;version="1.13";resolution:=optional, com.vividsolutions.jts.geom;version="1.14.0";resolution:=optional,
com.vividsolutions.jts.io;version="1.13";resolution:=optional, com.vividsolutions.jts.io;version="1.14.0";resolution:=optional,
org.h2;version="[${version},1.5.0)", org.h2;version="[${version},1.5.0)",
org.h2.api;version="[${version},1.5.0)", org.h2.api;version="[${version},1.5.0)",
org.h2.fulltext;version="[${version},1.5.0)", org.h2.fulltext;version="[${version},1.5.0)",
......
...@@ -125,7 +125,7 @@ public class Build extends BuildBase { ...@@ -125,7 +125,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.0.jar" +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" + File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" +
File.pathSeparator + System.getProperty("java.home") + File.pathSeparator + System.getProperty("java.home") +
...@@ -203,7 +203,7 @@ public class Build extends BuildBase { ...@@ -203,7 +203,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.0.jar" +
File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar"; File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
FileList files; FileList files;
if (clientOnly) { if (clientOnly) {
...@@ -302,9 +302,9 @@ public class Build extends BuildBase { ...@@ -302,9 +302,9 @@ public class Build extends BuildBase {
downloadOrVerify("ext/org.osgi.enterprise-4.2.0.jar", downloadOrVerify("ext/org.osgi.enterprise-4.2.0.jar",
"org/osgi", "org.osgi.enterprise", "4.2.0", "org/osgi", "org.osgi.enterprise", "4.2.0",
"8634dcb0fc62196e820ed0f1062993c377f74972", offline); "8634dcb0fc62196e820ed0f1062993c377f74972", offline);
downloadOrVerify("ext/jts-1.13.jar", downloadOrVerify("ext/jts-core-1.14.0.jar",
"com/vividsolutions", "jts", "1.13", "com/vividsolutions", "jts-core", "1.14.0",
"3ccfb9b60f04d71add996a666ceb8902904fd805", offline); "ff63492fba33a395f0da17720dd1716aba0d8c84", offline);
} }
private void downloadOrVerify(String target, String group, String artifact, private void downloadOrVerify(String target, String group, String artifact,
...@@ -576,7 +576,7 @@ public class Build extends BuildBase { ...@@ -576,7 +576,7 @@ public class Build extends BuildBase {
"org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext", "org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext",
"-classpath", "-classpath",
"ext/lucene-core-3.0.2.jar" + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-docletpath", "bin" + File.pathSeparator + "temp", "-docletpath", "bin" + File.pathSeparator + "temp",
"-doclet", "org.h2.build.doclet.Doclet"); "-doclet", "org.h2.build.doclet.Doclet");
copy("docs/javadoc", files("src/docsrc/javadoc"), "src/docsrc/javadoc"); copy("docs/javadoc", files("src/docsrc/javadoc"), "src/docsrc/javadoc");
...@@ -601,7 +601,7 @@ public class Build extends BuildBase { ...@@ -601,7 +601,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2", "-subpackages", "org.h2",
"-exclude", "org.h2.test.jaqu:org.h2.jaqu"); "-exclude", "org.h2.test.jaqu:org.h2.jaqu");
...@@ -617,7 +617,7 @@ public class Build extends BuildBase { ...@@ -617,7 +617,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2.mvstore", "-subpackages", "org.h2.mvstore",
"-exclude", "org.h2.mvstore.db"); "-exclude", "org.h2.mvstore.db");
...@@ -633,7 +633,7 @@ public class Build extends BuildBase { ...@@ -633,7 +633,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2", "-subpackages", "org.h2",
"-exclude", "org.h2.test.jaqu:org.h2.jaqu", "-exclude", "org.h2.test.jaqu:org.h2.jaqu",
"-package", "-package",
...@@ -847,7 +847,7 @@ public class Build extends BuildBase { ...@@ -847,7 +847,7 @@ public class Build extends BuildBase {
javadoc("-sourcepath", "src/main", "org.h2.tools", "org.h2.jmx", javadoc("-sourcepath", "src/main", "org.h2.tools", "org.h2.jmx",
"-classpath", "-classpath",
"ext/lucene-core-3.0.2.jar" + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-docletpath", "bin" + File.pathSeparator + "temp", "-docletpath", "bin" + File.pathSeparator + "temp",
"-doclet", "org.h2.build.doclet.ResourceDoclet"); "-doclet", "org.h2.build.doclet.ResourceDoclet");
} }
...@@ -897,7 +897,7 @@ public class Build extends BuildBase { ...@@ -897,7 +897,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.0.jar" +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" + File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" +
File.pathSeparator + System.getProperty("java.home") + File.pathSeparator + System.getProperty("java.home") +
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论