Author: desruisseaux
Date: Tue May 24 05:07:39 2016
New Revision: 1745301
URL: http://svn.apache.org/viewvc?rev=1745301&view=rev
Log:
Add ISO 19111-2 on the list of supported standards. Minor opportunist editions.
Modified:
sis/site/trunk/book/en/introduction.html
sis/site/trunk/book/fr/introduction.html
sis/site/trunk/content/command-line.mdtext
Modified: sis/site/trunk/book/en/introduction.html
URL:
http://svn.apache.org/viewvc/sis/site/trunk/book/en/introduction.html?rev=1745301&r1=1745300&r2=1745301&view=diff
==============================================================================
--- sis/site/trunk/book/en/introduction.html (original)
+++ sis/site/trunk/book/en/introduction.html Tue May 24 05:07:39 2016
@@ -243,157 +243,139 @@
<th>Titre</th>
<th>GeoAPI package</th>
<th>Apache SIS package</th>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Abstract Specifications</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19103</td>
<td></td>
<td><i>Conceptual schema language</i></td>
<td><code>org.opengis.util</code></td>
<td><code>org.apache.sis.util.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19115-1</td>
<td>Topic 11</td>
<td><i>Metadata</i></td>
<td><code>org.opengis.metadata</code></td>
<td><code>org.apache.sis.metadata.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19115-2</td>
<td></td>
<td><i>Metadata â extensions for imagery and gridded data</i></td>
<td><code>org.opengis.metadata</code></td>
<td><code>org.apache.sis.metadata.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19111</td>
<td>Topic 2</td>
<td><i>Spatial referencing by coordinates</i></td>
<td><code>org.opengis.referencing</code></td>
<td><code>org.apache.sis.referencing</code></td>
- </tr>
- <tr>
+ </tr><tr>
+ <td><abbr>ISO</abbr> 19111-2</td>
+ <td></td>
+ <td><i>Referencing â extension for parametric values</i></td>
+ <td><code>org.opengis.referencing</code></td>
+ <td><code>org.apache.sis.referencing</code></td>
+ </tr><tr>
<td><abbr>ISO</abbr> 19108</td>
<td></td>
<td><i>Temporal Schema</i></td>
<td><code>org.opengis.temporal</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19107</td>
<td>Topic 1</td>
<td><i>Feature geometry</i></td>
<td><code>org.opengis.geometry</code></td>
<td><code>org.apache.sis.geometry</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19101</td>
<td>Topic 5</td>
<td><i>Features</i></td>
<td><code>org.opengis.feature</code></td>
<td><code>org.apache.sis.feature</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19123</td>
<td>Topic 6</td>
<td><i>Schema for coverage geometry and functions</i></td>
<td><code>org.opengis.coverage</code></td>
<td><code>org.apache.sis.coverage</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19156</td>
<td>Topic 20</td>
<td><i>Observations and measurements</i></td>
<td><code>org.opengis.observation</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Implementation Specifications</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19139</td>
<td></td>
<td><i>Metadata <abbr>XML</abbr> schema implementation</i></td>
<td></td>
<td><code>org.apache.sis.xml</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19136</td>
<td>OGC 07-036</td>
<td><i>Geography Markup Language (<abbr>GML</abbr>) Encoding
Standard</i></td>
<td></td>
<td><code>org.apache.sis.xml</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19162</td>
<td>OGC 12-063</td>
<td><i>Well-known text representation of coordinate reference
systems</i></td>
<td></td>
<td><code>org.apache.sis.io.wkt</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 13249</td>
<td></td>
<td><i><abbr>SQL</abbr> spatial</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><s><abbr>OGC</abbr> 01-009</s></td>
<td><s><i>Coordinate Transformation Services</i></s></td>
<td><code>org.opengis.referencing</code></td>
<td><code>org.apache.sis.referencing</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><s><abbr>OGC</abbr> 01-004</s></td>
<td><s><i>Grid Coverage</i></s></td>
<td><code>org.opengis.coverage</code></td>
<td><code>org.apache.sis.coverage</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SLD</abbr></td>
<td><i>Styled Layer Descriptor</i></td>
<td><code>org.opengis.style</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Web Services</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19128</td>
<td><abbr>WMS</abbr></td>
<td><i>Web Map Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WMTS</abbr></td>
<td><i>Web Map Tile Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19142</td>
<td><abbr>WFS</abbr></td>
<td><i>Web Feature Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WCS</abbr></td>
<td><i>Web Coverage Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WPS</abbr></td>
<td><i>Web Processing Service</i></td>
@@ -406,15 +388,13 @@
<td><i>Location Services</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SWE</abbr></td>
<td><i>Sensor Web Enablement</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SOS</abbr></td>
<td><i>Sensor Observation Service</i></td>
Modified: sis/site/trunk/book/fr/introduction.html
URL:
http://svn.apache.org/viewvc/sis/site/trunk/book/fr/introduction.html?rev=1745301&r1=1745300&r2=1745301&view=diff
==============================================================================
--- sis/site/trunk/book/fr/introduction.html (original)
+++ sis/site/trunk/book/fr/introduction.html Tue May 24 05:07:39 2016
@@ -272,178 +272,157 @@
<th>Titre</th>
<th>Paquet de GeoAPI</th>
<th>Paquet de Apache SIS</th>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Spécifications abstraites</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19103</td>
<td></td>
<td><i>Conceptual schema language</i></td>
<td><code>org.opengis.util</code></td>
<td><code>org.apache.sis.util.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19115-1</td>
<td>Topic 11</td>
<td><i>Metadata</i></td>
<td><code>org.opengis.metadata</code></td>
<td><code>org.apache.sis.metadata.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19115-2</td>
<td></td>
<td><i>Metadata â extensions for imagery and gridded data</i></td>
<td><code>org.opengis.metadata</code></td>
<td><code>org.apache.sis.metadata.iso</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19111</td>
<td>Topic 2</td>
<td><i>Spatial referencing by coordinates</i></td>
<td><code>org.opengis.referencing</code></td>
<td><code>org.apache.sis.referencing</code></td>
- </tr>
- <tr>
+ </tr><tr>
+ <td><abbr>ISO</abbr> 19111-2</td>
+ <td></td>
+ <td><i>Referencing â extension for parametric values</i></td>
+ <td><code>org.opengis.referencing</code></td>
+ <td><code>org.apache.sis.referencing</code></td>
+ </tr><tr>
<td><abbr>ISO</abbr> 19108</td>
<td></td>
<td><i>Temporal Schema</i></td>
<td><code>org.opengis.temporal</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19107</td>
<td>Topic 1</td>
<td><i>Feature geometry</i></td>
<td><code>org.opengis.geometry</code></td>
<td><code>org.apache.sis.geometry</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19101</td>
<td>Topic 5</td>
<td><i>Features</i></td>
<td><code>org.opengis.feature</code></td>
<td><code>org.apache.sis.feature</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19123</td>
<td>Topic 6</td>
<td><i>Schema for coverage geometry and functions</i></td>
<td><code>org.opengis.coverage</code></td>
<td><code>org.apache.sis.coverage</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19156</td>
<td>Topic 20</td>
<td><i>Observations and measurements</i></td>
<td><code>org.opengis.observation</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Spécifications
dâimplémentation</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19139</td>
<td></td>
<td><i>Metadata <abbr>XML</abbr> schema implementation</i></td>
<td></td>
<td><code>org.apache.sis.xml</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19136</td>
<td>OGC 07-036</td>
<td><i>Geography Markup Language (<abbr>GML</abbr>) Encoding
Standard</i></td>
<td></td>
<td><code>org.apache.sis.xml</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19162</td>
<td>OGC 12-063</td>
<td><i>Well-known text representation of coordinate reference
systems</i></td>
<td></td>
<td><code>org.apache.sis.io.wkt</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 13249</td>
<td></td>
<td><i><abbr>SQL</abbr> spatial</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><s><abbr>OGC</abbr> 01-009</s></td>
<td><s><i>Coordinate Transformation Services</i></s></td>
<td><code>org.opengis.referencing</code></td>
<td><code>org.apache.sis.referencing</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><s><abbr>OGC</abbr> 01-004</s></td>
<td><s><i>Grid Coverage</i></s></td>
<td><code>org.opengis.coverage</code></td>
<td><code>org.apache.sis.coverage</code></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SLD</abbr></td>
<td><i>Styled Layer Descriptor</i></td>
<td><code>org.opengis.style</code></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td class="separator" colspan="5">Services web</td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19128</td>
<td><abbr>WMS</abbr></td>
<td><i>Web Map Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WMTS</abbr></td>
<td><i>Web Map Tile Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td><abbr>ISO</abbr> 19142</td>
<td><abbr>WFS</abbr></td>
<td><i>Web Feature Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WCS</abbr></td>
<td><i>Web Coverage Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>WPS</abbr></td>
<td><i>Web Processing Service</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td>Open<abbr>LS</abbr></td>
<td><i>Location Services</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SWE</abbr></td>
<td><i>Sensor Web Enablement</i></td>
<td></td>
<td></td>
- </tr>
- <tr>
+ </tr><tr>
<td></td>
<td><abbr>SOS</abbr></td>
<td><i>Sensor Observation Service</i></td>
Modified: sis/site/trunk/content/command-line.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/command-line.mdtext?rev=1745301&r1=1745300&r2=1745301&view=diff
==============================================================================
--- sis/site/trunk/content/command-line.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/command-line.mdtext [UTF-8] Tue May 24 05:07:39 2016
@@ -20,7 +20,7 @@ A command-line interface is provided for
and for performing coordinate operations.
That command-line tool is provided for allowing users to experiment some
Apache SIS functionalities
without writing Java code.
-For each example, key Java methods are listed for allowing users to reproduce
the functionality
+For each example, key Java APIs are listed for allowing users to reproduce the
functionality
in their own application.
@@ -190,7 +190,7 @@ Apache SIS can also read and write CRS d
For GML output, one can add the `--format xml` option to the above command.
The result will be much more verbose than WKT outputs.
-Java methods for accessing functionalities shown in above examples are:
+Java API for accessing functionalities shown in above examples are:
* Convenience static methods in `org.apache.sis.referencing` package:
+ `CRS.forCode(String)`
@@ -287,7 +287,7 @@ _“Mercator (variant A)”_ projection
_“Mercator (variant B)”_ projection with a _“Latitude of 1st standard
parallel”_ parameter value of 41° on the same datum.
This recognition allowed SIS to return the EPSG:3994 code even if it stands
for a CRS defined as a _“Mercator (variant B)”_ projection rather than variant
A.
-Java methods for accessing functionalities shown in above example are:
+Java API for accessing functionalities shown in above example are:
* Convenience static method in `org.apache.sis.referencing` package:
+ `IdentifiedObjects.lookupURN(IdentifiedObject, Citation)`
@@ -361,7 +361,7 @@ Those parameters could also be different
Parameter["Latitude difference file", "conus.las"],
Parameter["Longitude difference file", "conus.los"],
-Java methods for accessing functionalities shown in above examples are:
+Java API for accessing functionalities shown in above examples are:
* Convenience static method in `org.apache.sis.referencing` package:
+ `CRS.findOperation(CoordinateReferenceSystem, CoordinateReferenceSystem,
GeographicBoundingBox)`
@@ -428,7 +428,7 @@ The following example show the metadata
Adding the `--format xml` option to the above command will format the same
metadata in a XML document.
The output is not shown in this page because of its verbosity.
-Java methods for accessing functionalities shown in above examples are:
+Java API for accessing functionalities shown in above examples are:
* Convenience static methods in `org.apache.sis.xml` package:
+ `XML.marshal(…)`
