svn commit: r877444 - in /websites/staging/jena/trunk/content: ./ documentation/query/spatial-query.html

[bu...@apache.org]

Author: buildbot
Date: Fri Sep  6 03:14:33 2013
New Revision: 877444

Log:
Staging update by buildbot for jena

Modified:
    websites/staging/jena/trunk/content/   (props changed)
    websites/staging/jena/trunk/content/documentation/query/spatial-query.html

Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep  6 03:14:33 2013
@@ -1 +1 @@
-1520115
+1520480

Modified: websites/staging/jena/trunk/content/documentation/query/spatial-query.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/spatial-query.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/spatial-query.html Fri Sep  6 03:14:33 2013
@@ -148,17 +148,20 @@ for a large scale enterprise search appl
 
 <h2 id="table-of-contents">Table of Contents</h2>
 <ul>
-<li><a href="#architecture">Architecture</a></li>
-<li><a href="#query-with-sparql">Query with SPARQL</a></li>
-<li><a href="#configuration">Configuration</a><ul>
-<li><a href="#text-dataset-assembler">Text Dataset Assembler</a></li>
-<li><a href="#configuration-by-code">Configuration by Code</a></li>
+<li><a href="#how-to-use-it-by-code">How to Use it by Code</a><ul>
+<li><a href="#create-spatial-dataset">Create Spatial Dataset</a></li>
+<li><a href="#supported-geo-data-for-indexing-and-querying">Supported Geo Data for Indexing and Querying</a><ul>
+<li><a href="#builtin-geo-predicates">Builtin Geo Prodicates</a></li>
+<li><a href="#custom-geo-predicates">Custom Geo Prodicates</a></li>
 </ul>
 </li>
+<li><a href="#load-geo-data-into-spatial-dataset">Load Geo Data into Spatial Dataset</a></li>
+</ul>
+</li>
+<li><a href="#property-function-library">Property Function Library</a></li>
+<li><a href="#spatial-dataset-assembler">Spatial Dataset Assembler</a></li>
 <li><a href="#working-with-fuseki">Working with Fuseki</a></li>
-<li><a href="#building-a-text-index">Building a Text Index</a></li>
-<li><a href="#deletion-of-indexed-entities">Deletion of Indexed Entities</a></li>
-<li><a href="#maven-dependency">Maven Dependency</a></li>
+<li><a href="#building-a-spatial-index">Building a Spatial Index</a></li>
 </ul>
 <h2 id="how-to-use-it-by-code">How to Use it by Code</h2>
 <h3 id="create-spatial-dataset">Create Spatial Dataset</h3>
@@ -177,7 +180,7 @@ for a large scale enterprise search appl
 </pre></div>
 
 
-<h3 id="supported-geo-data-for-indexingquerying">Supported Geo Data for Indexing/Querying</h3>
+<h3 id="supported-geo-data-for-indexing-and-querying">Supported Geo Data for Indexing and Querying</h3>
 <h4 id="builtin-geo-prodicates">Builtin Geo Prodicates</h4>
 <p>There're mainly 2 types of RDF representation of geo data, which are both supported by jena-spatial:</p>
 <p><strong>1) Latitude/Longitude Format (in gonames, DBPedia and Linked Geo Data)</strong></p>
@@ -200,8 +203,8 @@ for a large scale enterprise search appl
 </pre></div>
 
 
-<p><strong>The builtin predicates that can be automatically processed by jena-spatial include: 1) <code>geo:lat</code>, <code>geo:long</code>; 2) <code>geo:geometry</code>, <code>ogc:asWKT</code>.</strong>
-For 2) WKT, DBPedia uses <code>geo:geometry</code>, while Linked Geo Data adopts <code>ogc:asWKT</code> and <code>geo:geometry</code>.</p>
+<p>For 2) WKT, DBPedia uses <code>geo:geometry</code>, while Linked Geo Data adopts <code>ogc:asWKT</code> and <code>geo:geometry</code>.</p>
+<p>The builtin predicates that can be automatically processed by jena-spatial include: 1) <code>geo:lat</code>, <code>geo:long</code>; 2) <code>geo:geometry</code>, <code>ogc:asWKT</code>.</p>
 <p><strong>Important note</strong> In order to read geo data in 2) WKT literal format, jena-spatial uses <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a>,
 which is under LGPL licence. jena-spatial <strong>does not</strong> make a hard dependency on JTS. In other words,
 if an end user just uses the feature of 1), there's no need to depend on JTS (i.e. nothing needs to be done). If he wants 2),
@@ -266,12 +269,12 @@ You can simply add predicates to let jen
 <td>Query for the <em>?place</em> within the <em>radius</em> distance of the location of <em>(latitude, longitude)</em>. The distance <em>units</em> can be: "kilometers"/"km", "miles"/"mi", "meters"/"m", "centimeters"/"cm", "milimeters"/"mm" or "degrees"/"de", which are delivered as the optional strings (the default value is "kilometers"). <em>limit</em> is an optional integer parameter for the limit of the query results (if <em>limilt</em>&lt;0, return all query results).</td>
 </tr>
 <tr>
-<td><em>?place</em> <strong>spatial:withinBox</strong> <em>(latitude</em>min, longitude<em>min, latitude</em>max, longitude<em>max [, limit])</em></td>
-<td>Query for the <em>?place</em> within the box area of <em>(latitude</em>min, longitude<em>min, latitude</em>max, longitude<em>max)</em>.</td>
+<td><em>?place</em> <strong>spatial:withinBox</strong> <em>(latitude_min, longitude_min, latitude_max, longitude_max [, limit])</em></td>
+<td>Query for the <em>?place</em> within the box area of <em>(latitude_min, longitude_min, latitude_max, longitude_max)</em>.</td>
 </tr>
 <tr>
-<td><em>?place</em> <strong>spatial:intersectBox</strong> <em>(latitude</em>min, longitude<em>min, latitude</em>max, longitude<em>max [, limit])</em></td>
-<td>Query for the <em>?place</em> intersecting the box area of <em>(latitude</em>min, longitude<em>min, latitude</em>max, longitude<em>max)</em>.</td>
+<td><em>?place</em> <strong>spatial:intersectBox</strong> <em>(latitude_min, longitude_min, latitude_max, longitude_max [, limit])</em></td>
+<td>Query for the <em>?place</em> intersecting the box area of <em>(latitude_min, longitude_min, latitude_max, longitude_max)</em>.</td>
 </tr>
 <tr>
 <td><em>?place</em> <strong>spatial:north</strong> <em>(latitude, longitude [, limit])</em></td>
@@ -294,7 +297,7 @@ You can simply add predicates to let jen
 <p>See <a href="http://edndoc.esri.com/arcsde/9.1/general_topics/understand_spatial_relations.htm">ESRIs docs on spatial relations</a></p>
 <h2 id="spatial-dataset-assembler">Spatial Dataset Assembler</h2>
 <p>The usual way to describe an index is with a <a href="http://jena.apache.org/documentation/assembler/index.html">Jena assembler description</a>. Configurations can also be built with <a href="#how-to-use-it-by-code">code</a>. The assembler describes a "spaital dataset" which has an underlying RDF dataset and a spatial index. The spatial index describes the spatial index technology (Lucene or Solr) and the details needed for for each.</p>
-<p>A spatial index has an "<a href="https://svn.apache.org/repos/asf/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">entity definition</a>" which defines the properties to index, the name of the lucene/solr field used for storing the URI itself (e.g. "entityField") and its geo information (e.g. latitude/longitude as "geoField"), and the custom geo predicates.</p>
+<p>A spatial index has an <a href="https://svn.apache.org/repos/asf/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">EntityDefinition</a> which defines the properties to index, the name of the lucene/solr field used for storing the URI itself (e.g. "entityField") and its geo information (e.g. latitude/longitude as "geoField"), and the custom geo predicates.</p>
 <p>For common RDF spatial query, only "entityField" and "geoField" are required with the <a href="#builtin-geo-predicates">builtin geo predicates</a> working well. More complex setups, with multiple <a href="#custom-geo-predicates">custom geo predicates</a> besides the two fields are possible.
 You also optionally use JtsSpatialContextFactory to support indexing WKT literals. </p>
 <p>Once setup this way, any data added to the spatial dataset is automatically indexed as well.</p>