sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1794727 [1/4] - in /sis/site/trunk: book/en/ book/en/annex/ book/en/coverage/ book/en/geometry/ book/en/introduction/ book/en/overview/ book/en/storage/ book/en/xml/ book/fr/ book/fr/overview/ book/fr/referencing/ book/fr/storage/ book/fr/...
Date Wed, 10 May 2017 14:38:19 GMT
Author: desruisseaux
Date: Wed May 10 14:38:19 2017
New Revision: 1794727

URL: http://svn.apache.org/viewvc?rev=1794727&view=rev
Log:
Change chapters order with overview first and more detailled chapters last.

Added:
    sis/site/trunk/book/en/overview/
    sis/site/trunk/book/en/overview/DataAccess.html
    sis/site/trunk/book/en/storage/
      - copied from r1794726, sis/site/trunk/book/en/xml/
    sis/site/trunk/book/en/storage/Formats.html
      - copied, changed from r1794656, sis/site/trunk/book/en/xml/XML-ISO.html
    sis/site/trunk/book/fr/overview/
    sis/site/trunk/book/fr/overview/DataAccess.html
    sis/site/trunk/book/fr/storage/
      - copied from r1794726, sis/site/trunk/book/fr/xml/
    sis/site/trunk/book/fr/storage/Formats.html
      - copied, changed from r1794656, sis/site/trunk/book/fr/xml/XML-ISO.html
Removed:
    sis/site/trunk/book/en/xml/
    sis/site/trunk/book/fr/xml/
Modified:
    sis/site/trunk/book/en/annex/ReduceDependency.html
    sis/site/trunk/book/en/coverage/Coverage.html
    sis/site/trunk/book/en/geometry/GeometryBase.html
    sis/site/trunk/book/en/index.html
    sis/site/trunk/book/en/introduction/AboutBook.html
    sis/site/trunk/book/en/introduction/GeoAPI.html
    sis/site/trunk/book/en/storage/XML-ISO-19115.html
    sis/site/trunk/book/en/storage/XML-ISO.html
    sis/site/trunk/book/fr/index.html
    sis/site/trunk/book/fr/referencing/Referencing.html
    sis/site/trunk/book/fr/storage/XML-ISO-19115.html
    sis/site/trunk/book/fr/storage/XML-ISO.html
    sis/site/trunk/content/book/en/developer-guide.html
    sis/site/trunk/content/book/fr/developer-guide.html
    sis/site/trunk/content/command-line.mdtext

Modified: sis/site/trunk/book/en/annex/ReduceDependency.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/annex/ReduceDependency.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/annex/ReduceDependency.html [UTF-8] (original)
+++ sis/site/trunk/book/en/annex/ReduceDependency.html [UTF-8] Wed May 10 14:38:19 2017
@@ -65,7 +65,7 @@ System.out.println("The standard name fo
         The reverse operation — getting the Java class and method from a standard name
— is a bit more complicated.
         It requires reading the <code class="GeoAPI">class-index.properties</code>
file provided in the <code>org.opengis.annotation</code> package.
         The following example reads the files just before searching for the name of the interface
corresponding to <code>CI_Citation</code>.
-        Users are always encouraged to only read this file once and then save its contents
in their application's cache.
+        Users are always encouraged to only read this file once and then save its contents
in their application’s cache.
       </p>
 
 <pre>Properties isoToGeoAPI = new Properties();

Modified: sis/site/trunk/book/en/coverage/Coverage.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/coverage/Coverage.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/coverage/Coverage.html [UTF-8] (original)
+++ sis/site/trunk/book/en/coverage/Coverage.html [UTF-8] Wed May 10 14:38:19 2017
@@ -81,7 +81,7 @@
         <code>CV_DiscreteCoverage</code> type.
       </p>
       <aside>
-        <h2>SIS's <code>Range</code> class and its relationship to the
standards</h2>
+        <h2>SIS’s <code>Range</code> class and its relationship to the
standards</h2>
         <p>
           The distinction between the ranges of all types of values and the ranges of numeric
values is represented in
           <abbr>SIS</abbr> by the <code>Range</code> and <code>NumberRange</code>

Modified: sis/site/trunk/book/en/geometry/GeometryBase.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/geometry/GeometryBase.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/geometry/GeometryBase.html [UTF-8] (original)
+++ sis/site/trunk/book/en/geometry/GeometryBase.html [UTF-8] Wed May 10 14:38:19 2017
@@ -51,7 +51,7 @@
         All geometries are specializations of <code>TransfiniteSet</code>.
         The parent class of those geometries is called <code>GM_Object</code>
in <abbr>ISO</abbr> 19107 standard.
         GeoAPI interfaces use the <code>Geometry</code> name instead, as the
omission of the <code class="OGC">GM_</code>
-        prefix (as prescribed in GeoAPI convention) would leave a name too similar to Java's
<code>Object</code> class.
+        prefix (as prescribed in GeoAPI convention) would leave a name too similar to Java’s
<code>Object</code> class.
       </p>
 
 
@@ -72,7 +72,7 @@
         <code class="OGC">DirectPosition</code> and <code>GM_Point</code>.
         It is a union in the sense of C/C++. For the Java language, GeoAPI obtains the same
effect by defining
         <code>Position</code> as the parent interface of <code>DirectPosition</code>
and <code>Point</code>.
-        In practice, the great majority of Apache <abbr>SIS</abbr>'s <abbr>API</abbr>
works on <code>DirectPosition</code>s,
+        In practice, the great majority of Apache <abbr>SIS</abbr>’s <abbr>API</abbr>
works on <code>DirectPosition</code>s,
         or occasionally on <code>Position</code>s when it seems useful to also
allow geometric points.
       </p>
 
@@ -179,7 +179,7 @@
         longitudes in the range [0 … 360]°.
         The conversions, if necessary, are up to the user
         (the <code>Envelopes</code> class provides convenience methods to do
this).
-        Moreover, the envelope's coordinates must be included within the system of coordinates,
+        Moreover, the envelope’s coordinates must be included within the system of coordinates,
         unless the developer explicitly decides to consider (for example) 300° longitude
as a position distinct from -60°.
         The <code>GeneralEnvelope</code> class provides a <code class="SIS">normalize()</code>
method to bring
         coordinates within the desired limits, sometimes at the coast of <cite><i>lower</i></cite>
values being higher than

Modified: sis/site/trunk/book/en/index.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/index.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/index.html [UTF-8] (original)
+++ sis/site/trunk/book/en/index.html [UTF-8] Wed May 10 14:38:19 2017
@@ -44,11 +44,12 @@
 
     <main>
       <xi:include href="introduction/Standards.html"/>
-      <xi:include href="referencing/Referencing.html"/>
-      <xi:include href="Geometry/geometry.html"/>
+      <xi:include href="overview/DataAccess.html"/>
       <xi:include href="Coverage/coverage.html"/>
+      <xi:include href="Geometry/geometry.html"/>
+      <xi:include href="referencing/Referencing.html"/>
+      <xi:include href="storage/Formats.html"/>
       <xi:include href="utility/Utilities.html"/>
-      <xi:include href="xml/XML-ISO.html"/>
       <xi:include href="annex/Annexes.html"/>
     </main>
   </body>

Modified: sis/site/trunk/book/en/introduction/AboutBook.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/introduction/AboutBook.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/introduction/AboutBook.html [UTF-8] (original)
+++ sis/site/trunk/book/en/introduction/AboutBook.html [UTF-8] Wed May 10 14:38:19 2017
@@ -44,9 +44,9 @@
         For example, <abbr>ISO</abbr> 19123 applies these terms to <code>CV_Coverage</code>
objects,
         seen as functions in which the <i>domain</i> is the set of spatio-temporal
coordinates encompassed by the data,
         and the <i>range</i> is the set of values encompassed.
-        But <abbr title="University Corporation for Atmospheric Research">UCAR</abbr>'s
<abbr title="Network Common Data Form">NetCDF</abbr> library
+        But <abbr title="University Corporation for Atmospheric Research">UCAR</abbr>’s
<abbr title="Network Common Data Form">NetCDF</abbr> library
         applies these terms instead to the function of converting pixel indices (its <i>domain</i>)
to spatial-temporal coordinates (its <i>range</i>).
-        Thus the <abbr>UCAR</abbr> library's <i>range</i> may be
the <i>domain</i> of <abbr>ISO</abbr> 19123.
+        Thus the <abbr>UCAR</abbr> library’s <i>range</i> may be
the <i>domain</i> of <abbr>ISO</abbr> 19123.
       </p><p>
         The Apache <abbr>SIS</abbr> library prefers as much as possible to use
terms in the sense of <abbr>OGC</abbr> and <abbr>ISO</abbr> norms.
         Particular care must be taken, however, with the interfaces between <abbr>SIS</abbr>
and certain other external libraries,

Modified: sis/site/trunk/book/en/introduction/GeoAPI.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/introduction/GeoAPI.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/introduction/GeoAPI.html [UTF-8] (original)
+++ sis/site/trunk/book/en/introduction/GeoAPI.html [UTF-8] Wed May 10 14:38:19 2017
@@ -52,12 +52,12 @@
           Interoperability is facilitated by a better separation between applications that
<em>call</em> GeoAPI functions,
           and libraries that <em>implement</em> GeoAPI.
           The separation is similar to that offered by the <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/"><abbr>JDBC</abbr></a>
(<i>Java Database Connectivity</i>) interfaces of standard Java.
-          Using the interfaces' <abbr>API</abbr>, developers can ignore the underlying
implementation.
+          Using the interfaces’ <abbr>API</abbr>, developers can ignore the
underlying implementation.
           For example, they can perform cartographic projections with the help of the <a
href="http://www.geoapi.org/geoapi-proj4/index.html">Proj.4</a> library, or the Apache
<abbr>SIS</abbr> library,
           without having to change their programs when they change libraries.
         </p></li>
         <li><p>
-          The developers of libraries inherit the expertise of the specifications' authors,
via the models that represent interfaces.
+          The developers of libraries inherit the expertise of the specifications’ authors,
via the models that represent interfaces.
           GeoAPI also provides a framework within which developers can prioritize the implementation
of the features they most need,
           while leaving the remaining features as extension points for future developments.
           For example, clients can call a GeoAPI function even if it is not yet supported
by the library,
@@ -267,7 +267,7 @@
               <em>copy</em> of all interfaces in the <code>geoapi</code>
module
               (not a dependence) with additions that have not yet been approved as an <abbr>OGC</abbr>
standard.
               Some additions appear in interfaces normally defined by the <code>geoapi</code>
module, hence the need to copy them.
-              Apache <abbr>SIS</abbr>'s development branches <code>jdk7</code>
and <code>jdk8</code> depend on this module,
+              Apache <abbr>SIS</abbr>’s development branches <code>jdk7</code>
and <code>jdk8</code> depend on this module,
               but this dependence becomes a dependence on the <code>geoapi</code>
standard module when the branches are merged to the trunk.
             </p></li>
             <li><p>
@@ -352,7 +352,7 @@ System.out.println("Standard name of typ
         They are either extensions of GeoAPI, or else types defined in other libraries, such
as standard <abbr title="Java Development Kit">JDK</abbr>.
         In this last case, the mapping to <abbr>ISO</abbr> standards is implicit.
         The following table describes this mapping for <abbr>ISO</abbr> 19103
types.
-        Java's primitive types are preferred when applicable,
+        Java’s primitive types are preferred when applicable,
         but where necessary their wrappers are used in order to authorize null values.
       </p>
       <table>
@@ -510,8 +510,8 @@ System.out.println("Standard name of typ
         For example, it is useful on a server that simultaneously provides pages in multiple
languages.
         By returning translations when objects are used rather than at the time of their
creation,
         we allow the <abbr>SIS</abbr> library to provide the same instances of
<code>Metadata</code>
-        or <code>Coverage</code> (for example) for the same data, regardless
of the client's language.
-        Translations may be made on the fly with the help of the application's <code>ResourceBundle</code>,
+        or <code>Coverage</code> (for example) for the same data, regardless
of the client’s language.
+        Translations may be made on the fly with the help of the application’s <code>ResourceBundle</code>,
         or may be provided directly with the data (as in the case of <code>Metadata</code>).
       </p>
       <p>

Added: sis/site/trunk/book/en/overview/DataAccess.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/overview/DataAccess.html?rev=1794727&view=auto
==============================================================================
--- sis/site/trunk/book/en/overview/DataAccess.html (added)
+++ sis/site/trunk/book/en/overview/DataAccess.html Wed May 10 14:38:19 2017
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html>
+
+<!--
+  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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude"
xml:lang="fr">
+  <head>
+    <title>DataAccess</title>
+    <meta charset="UTF-8"/>
+    <link rel="stylesheet" type="text/css" href="../../../content/book/book.css"/>
+  </head>
+  <body>
+    <!--
+      Content below this point is copied in "(…)/content/book/en/developer-guide.html"
file
+      by the 'org.apache.sis.internal.book.Assembler' class in 'sis-build-helper' module.
+    -->
+    <section>
+      <header>
+        <h1 id="DataAccess">Geospatial data access</h1>
+      </header>
+      <p>
+        <span style="color: red">TODO</span>
+      </p>
+    </section>
+  </body>
+</html>

Copied: sis/site/trunk/book/en/storage/Formats.html (from r1794656, sis/site/trunk/book/en/xml/XML-ISO.html)
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/storage/Formats.html?p2=sis/site/trunk/book/en/storage/Formats.html&p1=sis/site/trunk/book/en/xml/XML-ISO.html&r1=1794656&r2=1794727&rev=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/xml/XML-ISO.html [UTF-8] (original)
+++ sis/site/trunk/book/en/storage/Formats.html [UTF-8] Wed May 10 14:38:19 2017
@@ -22,7 +22,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude"
xml:lang="en">
   <head>
-    <title>XML-ISO</title>
+    <title>Formats</title>
     <meta charset="UTF-8"/>
     <link rel="stylesheet" type="text/css" href="../../../content/book/book.css"/>
   </head>
@@ -33,97 +33,13 @@
     -->
     <section>
       <header>
-        <h1 id="XML-ISO">Representing objects in <abbr>XML</abbr></h1>
+        <h2 id="Formats">Date storage formats</h2>
       </header>
       <p>
-        Objects defined by <abbr>OGC</abbr>/<abbr>ISO</abbr> standards
must be able to communicate with remote machines via the Internet,
-        using different software written in different languages.
-        Some of the better known formats include <abbr>WKT</abbr> (<i>Well-Known
Text</i>) and <abbr>WKB</abbr> (<i>Well-Known Binary</i>).
-        But the most exhaustive and often referred format is <abbr>XML</abbr>,
-        to the point where the representation of <abbr>ISO</abbr> objects in
this format is itself sometimes
-        the entire focus of an international standard.
-        Thus are metadata classes described in <abbr>ISO</abbr> 19115-1 standard
(an abstract specification),
-        while the representation of these classes in <abbr>XML</abbr> is described
in <abbr>ISO</abbr> 19115-3 and 19139 standards.
+        <span style="color: red">TODO</span>
       </p>
-      <p>
-        Different <abbr>OGC</abbr>/<abbr>ISO</abbr> standards do
not always use the same strategy to express objects in <abbr>XML</abbr>.
-        <abbr>ISO</abbr> 19115-3 standard in particular uses a more verbose approach
than other standards,
-        and will be the subject of its <a href="#XML-ISO-19115">own section</a>.
-        But most <abbr>XML</abbr> formats define supplementary types and attributes
that are not part of the original abstract specifications.
-        These supplementary attributes are usually specific to <abbr>XML</abbr>
and may not appear in the <abbr>API</abbr> of Apache <abbr>SIS</abbr>.
-        However, some of these attributes, such as <code class="OGC">id</code>,
<code class="OGC">uuid</code> and
-        <code>xlink:href</code>, remain accessible in the form of key-value pairs.
-      </p>
-      <p>
-        <abbr>XML</abbr> documents may use any prefixes,
-        but the following prefixes are commonly used.
-        They therefore appear by default in documents produced by Apache <abbr>SIS</abbr>.
-        These prefixes are defined in the <code>org.apache.sis.xml.Namespaces</code>
class.
-      </p>
-      <table>
-        <caption>Common <abbr>XML</abbr> namespace prefixes</caption>
-        <tr>
-          <th>Prefix</th>
-          <th>Namespace</th>
-        </tr>
-        <tr>
-          <td><code>gco</code></td>
-          <td><code>http://www.isotc211.org/2005/gco</code></td>
-        </tr>
-        <tr>
-          <td><code>gfc</code></td>
-          <td><code>http://www.isotc211.org/2005/gfc</code></td>
-        </tr>
-        <tr>
-          <td><code>gmd</code></td>
-          <td><code>http://www.isotc211.org/2005/gmd</code></td>
-        </tr>
-        <tr>
-          <td><code>gmi</code></td>
-          <td><code>http://www.isotc211.org/2005/gmi</code></td>
-        </tr>
-        <tr>
-          <td><code>gmx</code></td>
-          <td><code>http://www.isotc211.org/2005/gmx</code></td>
-        </tr>
-        <tr>
-          <td><code>gml</code></td>
-          <td><code>http://www.opengis.net/gml/3.2</code></td>
-        </tr>
-        <tr>
-          <td><code>xlink</code></td>
-          <td><code>http://www.w3.org/1999/xlink</code></td>
-        </tr>
-      </table>
-
-      <aside>
-        <h2>Tools for reading and writing <abbr>XML</abbr> documents</h2>
-        <p>
-          Apache <abbr>SIS</abbr> uses different libraries to read and write
different types of objects.
-          The library used depends on the complexity of the object and on performance constraints.
-          For example, <abbr title="Java Architecture for XML Binding">JAXB</abbr>
annotations have the advantage of being close to code,
-          which makes it easier to maintain mapping between Java and <abbr>XML</abbr>.
-          On the other hand, <abbr title="Simple API for XML">SAX</abbr> is more
efficient.
-          In general, Apache <abbr>SIS</abbr> uses:
-        </p>
-        <ul>
-          <li>
-            <abbr>JAXB</abbr> for objects that do not occur very often in <abbr>XML</abbr>
documents, but with complex structures and deep hierarchies.
-            The metadata set in <abbr>ISO</abbr> 19115-3 standard is a typical
example
-          </li>
-          <li>
-            <abbr>SAX</abbr> for objects that are relatively simple, but which
may exist in very large numbers.
-            The set of points in a geometry is a typical example.
-          </li>
-          <li>
-            <abbr title="Document Object Model">DOM</abbr> as an alternative
to <abbr>JAXB</abbr>
-            when the <abbr>XML</abbr> elements do not correspond exactly to Java
attributes.
-            <i>Features</i> are an example, as their structure is dynamic.
-          </li>
-        </ul>
-      </aside>
 
-      <xi:include href="XML-ISO-19115.html"/>
+      <xi:include href="XML-ISO.html"/>
     </section>
   </body>
 </html>

Modified: sis/site/trunk/book/en/storage/XML-ISO-19115.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/storage/XML-ISO-19115.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/storage/XML-ISO-19115.html [UTF-8] (original)
+++ sis/site/trunk/book/en/storage/XML-ISO-19115.html [UTF-8] Wed May 10 14:38:19 2017
@@ -33,7 +33,7 @@
     -->
     <section>
       <header>
-        <h2 id="XML-ISO-19115">Representing metadata according to <abbr>ISO</abbr>
19115-3</h2>
+        <h3 id="XML-ISO-19115">Representing metadata according to <abbr>ISO</abbr>
19115-3</h3>
       </header>
       <p>
         For each metadata class, there is an <abbr>XML</abbr> type with the same
name than in the abstract specification
@@ -136,7 +136,7 @@
       </aside>
 
 
-      <h3 id="gco-id">Identification of already-defined instances</h3>
+      <h4 id="gco-id">Identification of already-defined instances</h4>
       <p>
         The parent element may contain an <code class="OGC">id</code> or <code
class="OGC">uuid</code> attribute.
         If one of these attributes is present, the parent attribute may be completely omitted;
@@ -222,7 +222,7 @@ public class MyClass {
 
 
 
-      <h3 id="nilReason">Representing missing values</h3>
+      <h4 id="nilReason">Representing missing values</h4>
       <p>
         When a property is not defined, the corresponding GeoAPI method usually returns <code>null</code>.
         However, things become complicated when the missing property is a value considered
mandatory by <abbr>ISO</abbr> 19115 standard.

Modified: sis/site/trunk/book/en/storage/XML-ISO.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/en/storage/XML-ISO.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/en/storage/XML-ISO.html [UTF-8] (original)
+++ sis/site/trunk/book/en/storage/XML-ISO.html [UTF-8] Wed May 10 14:38:19 2017
@@ -33,7 +33,7 @@
     -->
     <section>
       <header>
-        <h1 id="XML-ISO">Representing objects in <abbr>XML</abbr></h1>
+        <h2 id="XML-ISO">Representing objects in <abbr>XML</abbr></h2>
       </header>
       <p>
         Objects defined by <abbr>OGC</abbr>/<abbr>ISO</abbr> standards
must be able to communicate with remote machines via the Internet,

Modified: sis/site/trunk/book/fr/index.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/index.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/fr/index.html [UTF-8] (original)
+++ sis/site/trunk/book/fr/index.html [UTF-8] Wed May 10 14:38:19 2017
@@ -44,11 +44,12 @@
 
     <main>
       <xi:include href="introduction/Standards.html"/>
-      <xi:include href="referencing/Referencing.html"/>
-      <xi:include href="Geometry/geometry.html"/>
+      <xi:include href="overview/DataAccess.html"/>
       <xi:include href="Coverage/coverage.html"/>
+      <xi:include href="Geometry/geometry.html"/>
+      <xi:include href="referencing/Referencing.html"/>
+      <xi:include href="storage/Formats.html"/>
       <xi:include href="utility/Utilities.html"/>
-      <xi:include href="xml/XML-ISO.html"/>
       <xi:include href="annex/Annexes.html"/>
     </main>
   </body>

Added: sis/site/trunk/book/fr/overview/DataAccess.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/overview/DataAccess.html?rev=1794727&view=auto
==============================================================================
--- sis/site/trunk/book/fr/overview/DataAccess.html (added)
+++ sis/site/trunk/book/fr/overview/DataAccess.html Wed May 10 14:38:19 2017
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html>
+
+<!--
+  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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude"
xml:lang="fr">
+  <head>
+    <title>DataAccess</title>
+    <meta charset="UTF-8"/>
+    <link rel="stylesheet" type="text/css" href="../../../content/book/book.css"/>
+  </head>
+  <body>
+    <!--
+      Content below this point is copied in "(…)/content/book/fr/developer-guide.html"
file
+      by the 'org.apache.sis.internal.book.Assembler' class in 'sis-build-helper' module.
+    -->
+    <section>
+      <header>
+        <h1 id="DataAccess">Accès aux données géospatiales</h1>
+      </header>
+      <p>
+        Bien qu’il soit possible de créer des structures de données directement
en mémoire,
+        le plus souvent les données sont lues à partir de fichiers ou autres types
d’entrepôts.
+        Il y a plusieurs moyens d’accéder à ces données, mais une façon
pratique est d’utiliser
+        la méthode de commodité <code>DataStores.open(Object)</code>.
+        L’argument donné à cette méthode peut être un chemin vers un fichier
+        (<code>File</code>, <code>Path</code>, <code>URL</code>,
<code>URI</code>),
+        un flux d’entrée vers un fichier déjà ouvert
+        (<code>Channel</code>, <code>DataInput</code>, <code>InputStream</code>,
<code>Reader</code>),
+        une connexion à une base de données (<code>DataSource</code>, <code>Connection</code>)
+        ou d’autres types d’objets spécifiques à la source de données.
+        La méthode <code>DataStores.open(Object)</code> se charge de détecter
le format de données
+        et retourne une instance de <code>DataStore</code> pouvant le lire.
+      </p>
+      <p>
+        Les fonctionnalités d’un <code>DataStore</code> dépendent
de la nature des données à manipuler
+        (couvertures de données, ensembles de géométries, séries temporelles,
<i>etc.</i>),
+        mais dans tous les cas il y aura toujours au moins quelques méta-données que
l’on peut extraire.
+        Les méta-données permettent d’identifier les phénomènes ou entités
décrits par les données
+        (température, occupation du sol, <i>etc.</i>),
+        la région géographique ou la plage temporelle couverte par les données ainsi
que leur résolution.
+        Certains sources suffisamment riches fournissent aussi une estimation de la qualité
des données,
+        des informations permettant de contacter la personne ou l’organisme responsable
des données,
+        les contraintes légales ou techniques à l’utilisation, l’historique
des traitements,
+        les dates prévues des prochaines mise-à-jour de mises-à-jour, <i>etc.</i>
+      </p>
+      <p>
+        Les différents formats de données ont souvent leur propre modèle de méta-données,
+        mais Apache <abbr>SIS</abbr> les traduits tous vers un modèle unique
afin de cacher cette hétérogénéité.
+        Cette approche, consistant à choisir un seul modèle de méta-données comme
<em>modèle pivot</em>, est fréquemment utilisée par d’autres bibliothèques
aussi.
+        Par exemple Apache Tika utilise le standard <cite>Dublin Core</cite>
comme modèle pivot,
+        alors que Java Image I/O définit son propre modèle pivot dans le paquet <code>javax.imageio.metadata</code>.
+        Pour Apache <abbr>SIS</abbr>, le modèle pivot choisit est le standard
international de méta-données en information géographique
+        <cite><abbr>ISO</abbr> 19115-1:2014 — principes de base</cite>,
complété par
+        <cite><abbr>ISO</abbr> 19115-2 — extensions pour l’acquisition
et le traitement</cite>.
+        Ce modèle organise les méta-données dans une arborescence où chaque information
est accessible via un chemin bien définit,
+        peu importe l’origine de cette information.
+        Par exemple si un format de données peut nous fournir les coordonnées géographiques
d’une boîte englobant toutes les données,
+        alors cette information sera toujours accessible (peu importe le format de données)
à partir de l’objet <code>Metadata</code>
+        sous le noeud <code>identificationInfo</code>, sous-noeud <code>extent</code>,
sous-noeud <code>geographicElement</code>.
+      </p>
+      <div class="example"><p><b>Exemple:</b>
+        le code suivant lit un fichier de méta-données d’une image Landsat-8 située
au Vietnam:
+        </p>
+
+<pre>try (DataStore ds = DataStores.open(new File("LC81230522014071LGN00_MTL.txt")))
{
+    Metadata md = getMetadata();
+
+    // Afin de simplifier cet exemple, nous omettons les vérifications de valeurs nulles
ou de collections vides.
+    Identification   idInfo = md    .getIdentificationInfo().iterator().next();
+    Extent           extent = idInfo.getExtents()           .iterator().next();
+    GeographicExtent bbox   = extent.getGeographicElements().iterator().next();
+
+    System.out.println("La région géographique des données est:");
+    System.out.println(bbox);
+}</pre>
+
+        <p>
+          Cet exemple produira la sortie suivante:
+        </p>
+
+<pre><samp>La région géographique des données est:
+Geographic Bounding Box
+  ├─West bound longitude……………………………
108°20′10,464″E
+  ├─East bound longitude……………………………
110°26′39,66″E
+  ├─South bound latitude……………………………
10°29′59,604″N
+  └─North bound latitude……………………………
12°37′25,716″N</samp></pre>
+
+      </div>
+    </section>
+  </body>
+</html>

Modified: sis/site/trunk/book/fr/referencing/Referencing.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/referencing/Referencing.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/fr/referencing/Referencing.html [UTF-8] (original)
+++ sis/site/trunk/book/fr/referencing/Referencing.html [UTF-8] Wed May 10 14:38:19 2017
@@ -123,7 +123,7 @@
         Toutefois ces objets n’effectuent aucune opération sur les coordonnées.
         Les <cite>conversions</cite> ainsi que les <cite>transformations</cite>
de coordonnées sont le travail d’une autre famille de classes,
         dont la racine est l’interface <code>CoordinateOperation</code>.
-        Ces classes seront discutées dans <a href="#CoordinateOperation">une autre
section</a>.
+        Ces classes seront discutées dans <a href="#CoordinateOperations">une autre
section</a>.
       </p>
 
       <xi:include href="ComponentsOfCRS.html"/>

Copied: sis/site/trunk/book/fr/storage/Formats.html (from r1794656, sis/site/trunk/book/fr/xml/XML-ISO.html)
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/storage/Formats.html?p2=sis/site/trunk/book/fr/storage/Formats.html&p1=sis/site/trunk/book/fr/xml/XML-ISO.html&r1=1794656&r2=1794727&rev=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/fr/xml/XML-ISO.html [UTF-8] (original)
+++ sis/site/trunk/book/fr/storage/Formats.html [UTF-8] Wed May 10 14:38:19 2017
@@ -22,7 +22,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude"
xml:lang="fr">
   <head>
-    <title>XML-ISO</title>
+    <title>Formats</title>
     <meta charset="UTF-8"/>
     <link rel="stylesheet" type="text/css" href="../../../content/book/book.css"/>
   </head>
@@ -33,100 +33,14 @@
     -->
     <section>
       <header>
-        <h1 id="XML-ISO">Représentation des objets en <abbr>XML</abbr></h1>
+        <h2 id="Formats">Formats de stockage des données</h2>
       </header>
       <p>
-        Les objets définis par les standards <abbr>OGC</abbr>/<abbr>ISO</abbr>
doivent pouvoir être échangés sur internet
-        entre des machines distantes, utilisant des logiciels différents écrits dans des
langages différents.
-        Quelques uns des formats les plus connus sont
-        le <abbr>WKT</abbr> (<i>Well-Known Text</i>) et
-        le <abbr>WKB</abbr> (<i>Well-Known Binary</i>).
-        Mais le format le plus exhaustif et souvent considéré comme la référence est
le <abbr>XML</abbr>,
-        au point où la façon de représenter les objets <abbr>ISO</abbr> dans
ce format fait parfois l’objet d’un standard international à part entière.
-        Ainsi, les classes de méta-données sont décrites dans le standard <abbr>ISO</abbr>
19115-1 (une spécification dite <i>abstraite</i>),
-        alors que la représentation de ces classes en <abbr>XML</abbr> est décrite
par les standards <abbr>ISO</abbr> 19115-3 et 19139.
-      </p>
-      <p>
-        Les différents standards <abbr>OGC</abbr>/<abbr>ISO</abbr>
n’emploient pas tous la même stratégie pour exprimer les objets en <abbr>XML</abbr>.
-        Le standard <abbr>ISO</abbr> 19115-3 en particulier emploie une approche
plus verbeuse que les autres normes,
-        et fera l’objet d’une <a href="#XML-ISO-19115">section particulière</a>.
-        Mais la plupart des formats <abbr>XML</abbr> ont en commun de définir
des types et des attributs supplémentaires
-        qui ne font pas partie des spécifications abstraites d’origines.
-        Ces attributs supplémentaires sont habituellement propres au <abbr>XML</abbr>
et peuvent ne pas apparaître directement dans l’<abbr>API</abbr> de Apache
<abbr>SIS</abbr>.
-        Certains de ces attributs, notamment <code class="OGC">id</code>, <code
class="OGC">uuid</code> et <code>xlink:href</code>,
-        restent toutefois accessibles sous forme de paires clé-valeurs.
-      </p>
-      <p>
-        Les documents <abbr>XML</abbr> peuvent employer les préfixes de leur
choix,
-        mais les préfixes suivants sont couramment employés dans la pratique.
-        Ils apparaissent donc par défaut dans les documents produits par Apache <abbr>SIS</abbr>.
-        Ces préfixes sont définis dans la classe <code>org.apache.sis.xml.Namespaces</code>.
-      </p>
-      <table>
-        <caption>Préfixes d’espaces de noms <abbr>XML</abbr> courants</caption>
-        <tr>
-          <th>Préfixe</th>
-          <th>Espace de nom</th>
-        </tr>
-        <tr>
-          <td><code>gco</code></td>
-          <td><code>http://www.isotc211.org/2005/gco</code></td>
-        </tr>
-        <tr>
-          <td><code>gfc</code></td>
-          <td><code>http://www.isotc211.org/2005/gfc</code></td>
-        </tr>
-        <tr>
-          <td><code>gmd</code></td>
-          <td><code>http://www.isotc211.org/2005/gmd</code></td>
-        </tr>
-        <tr>
-          <td><code>gmi</code></td>
-          <td><code>http://www.isotc211.org/2005/gmi</code></td>
-        </tr>
-        <tr>
-          <td><code>gmx</code></td>
-          <td><code>http://www.isotc211.org/2005/gmx</code></td>
-        </tr>
-        <tr>
-          <td><code>gml</code></td>
-          <td><code>http://www.opengis.net/gml/3.2</code></td>
-        </tr>
-        <tr>
-          <td><code>xlink</code></td>
-          <td><code>http://www.w3.org/1999/xlink</code></td>
-        </tr>
-      </table>
+        Apache <abbr>SIS</abbr> peut lire et écrire des données spatiales et
leurs méta-données associées dans différents formats.
 
-      <aside>
-        <h2>Outils de lecture et d’écriture de documents <abbr>XML</abbr></h2>
-        <p>
-          Apache <abbr>SIS</abbr> emploie différentes bibliothèques pour lire
et écrire différents type d’objets.
-          La bibliothèque utilisée dépend de la complexité de l’objet et des contraintes
de performances.
-          Par exemple les annotations de <abbr title="Java Architecture for XML Binding">JAXB</abbr>
ont l’avantage d’être proches du code,
-          ce qui facilite la maintenance de la correspondance entre le Java et le <abbr>XML</abbr>.
-          En revanche <abbr title="Simple API for XML">SAX</abbr> a l’avantage
d’être performant.
-          De manière générale, Apache <abbr>SIS</abbr> emploie:
-        </p>
-        <ul>
-          <li>
-            <abbr>JAXB</abbr> pour les objets qui ne sont pas répétés très
souvent dans le document
-            mais dont la structure est complexe, avec des arborescences profondes.
-            L’ensemble des méta-données <abbr>ISO</abbr> 19115-3 est un exemple
typique.
-          </li>
-          <li>
-            <abbr>SAX</abbr> pour les objets relativement simples mais pouvant
exister en très grand nombre.
-            L’ensemble des points dans une géométrie est un exemple typique.
-          </li>
-          <li>
-            <abbr title="Document Object Model">DOM</abbr> comme une alternative
à <abbr>JAXB</abbr>
-            lorsque les éléments <abbr>XML</abbr> ne correspondent pas directement
à des attributs Java.
-            Les <i>features</i> en sont un exemple, car leur structure est dynamique.
-          </li>
-        </ul>
-      </aside>
+      </p>
 
-      <xi:include href="XML-ISO-19115.html"/>
+      <xi:include href="XML-ISO.html"/>
     </section>
   </body>
 </html>

Modified: sis/site/trunk/book/fr/storage/XML-ISO-19115.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/storage/XML-ISO-19115.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/fr/storage/XML-ISO-19115.html [UTF-8] (original)
+++ sis/site/trunk/book/fr/storage/XML-ISO-19115.html [UTF-8] Wed May 10 14:38:19 2017
@@ -33,7 +33,7 @@
     -->
     <section>
       <header>
-        <h2 id="XML-ISO-19115">Représentation des méta-données selon <abbr>ISO</abbr>
19115-3</h2>
+        <h3 id="XML-ISO-19115">Représentation des méta-données selon <abbr>ISO</abbr>
19115-3</h3>
       </header>
       <p>
         Pour chaque classe de méta-donnée, il existe un type <abbr>XML</abbr>
portant le même nom que dans la spécification abstraite
@@ -139,7 +139,7 @@
       </aside>
 
 
-      <h3 id="gco-id">Identification d’instances déjà définies</h3>
+      <h4 id="gco-id">Identification d’instances déjà définies</h4>
       <p>
         L’élément englobant peut contenir un attribut <code class="OGC">id</code>
ou <code class="OGC">uuid</code>.
         Si un de ces attributs est présent, l’élément englobé peut être complètement
omis;
@@ -226,7 +226,7 @@ public class MyClass {
 
 
 
-      <h3 id="nilReason">Représentation de valeurs manquantes</h3>
+      <h4 id="nilReason">Représentation de valeurs manquantes</h4>
       <p>
         Lorsqu’une propriété n’est pas définie, la méthode correspondante de GeoAPI
retourne généralement <code>null</code>.
         Toutefois les choses se compliquent lorsque la propriété manquante est une valeur
considérée comme obligatoire par le standard <abbr>ISO</abbr> 19115.

Modified: sis/site/trunk/book/fr/storage/XML-ISO.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/fr/storage/XML-ISO.html?rev=1794727&r1=1794726&r2=1794727&view=diff
==============================================================================
--- sis/site/trunk/book/fr/storage/XML-ISO.html [UTF-8] (original)
+++ sis/site/trunk/book/fr/storage/XML-ISO.html [UTF-8] Wed May 10 14:38:19 2017
@@ -33,7 +33,7 @@
     -->
     <section>
       <header>
-        <h1 id="XML-ISO">Représentation des objets en <abbr>XML</abbr></h1>
+        <h2 id="XML-ISO">Représentation des objets en <abbr>XML</abbr></h2>
       </header>
       <p>
         Les objets définis par les standards <abbr>OGC</abbr>/<abbr>ISO</abbr>
doivent pouvoir être échangés sur internet



Mime
View raw message