sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/02: Replace "spatio-temporal" by "spatiotemporal" for more uniform spelling.
Date Tue, 30 Apr 2019 14:11:39 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9dabf8e44870d994856f1baf09bd16d36ba65399
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Apr 30 14:36:41 2019 +0200

    Replace "spatio-temporal" by "spatiotemporal" for more uniform spelling.
---
 .../apache/sis/internal/metadata/ReferencingServices.java    |  2 +-
 .../metadata/iso/extent/DefaultSpatialTemporalExtent.java    |  4 ++--
 .../main/java/org/apache/sis/internal/map/MapContext.java    |  2 +-
 .../referencing/operation/CoordinateOperationContext.java    | 12 ++++++------
 .../referencing/operation/CoordinateOperationRegistry.java   |  2 +-
 .../sis/referencing/operation/matrix/package-info.java       |  4 ++--
 .../referencing/operation/CoordinateOperationFinderTest.java |  4 ++--
 .../src/main/java/org/apache/sis/util/ArgumentChecks.java    |  2 +-
 .../src/main/java/org/apache/sis/internal/netcdf/Grid.java   |  2 +-
 .../org/apache/sis/internal/storage/AbstractResource.java    |  4 ++--
 .../java/org/apache/sis/internal/storage/StoreUtilities.java |  4 ++--
 .../main/java/org/apache/sis/internal/storage/csv/Store.java |  6 +++---
 .../src/main/java/org/apache/sis/storage/DataSet.java        |  4 ++--
 .../src/main/java/org/apache/sis/storage/Resource.java       |  2 +-
 .../main/java/org/apache/sis/internal/storage/gpx/Store.java |  4 ++--
 15 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
index e4a7485..fbf8d7c 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
@@ -262,7 +262,7 @@ public class ReferencingServices extends OptionalDependency {
      * </ul>
      *
      * @param  envelope  the source envelope.
-     * @param  target    the target spatio-temporal extent.
+     * @param  target    the target spatiotemporal extent.
      * @throws TransformException if no temporal component can be extracted from the given
envelope.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has
not been found on the classpath.
      */
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
index 4319e19..cde0054 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
@@ -188,7 +188,7 @@ public class DefaultSpatialTemporalExtent extends DefaultTemporalExtent
implemen
     }
 
     /**
-     * Sets this spatio-temporal extent to values inferred from the specified envelope.
+     * Sets this spatiotemporal extent to values inferred from the specified envelope.
      * The given envelope shall have at least a spatial, vertical or temporal component.
      *
      * <p>The spatial component is handled as below:</p>
@@ -217,7 +217,7 @@ public class DefaultSpatialTemporalExtent extends DefaultTemporalExtent
implemen
      * <b>Note:</b> This method is available only if the {@code sis-referencing}
module is
      * available on the classpath.
      *
-     * @param  envelope  the envelope to use for setting this spatio-temporal extent.
+     * @param  envelope  the envelope to use for setting this spatiotemporal extent.
      * @throws UnsupportedOperationException if the referencing module is not on the classpath.
      * @throws TransformException if the envelope can not be transformed to a temporal extent.
      */
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapContext.java
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapContext.java
index c71d9f3..097c9c3 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapContext.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapContext.java
@@ -51,7 +51,7 @@ public class MapContext extends MapGroup {
     /**
      * Returns the map area to show by default. This is not necessarily the
      * {@linkplain org.apache.sis.storage.DataSet#getEnvelope() envelope of data}
-     * since one may want to zoom in a different spatio-temporal area.
+     * since one may want to zoom in a different spatiotemporal area.
      *
      * <p>The {@linkplain org.apache.sis.geometry.GeneralEnvelope#getCoordinateReferenceSystem()
envelope CRS}
      * defines the map projection to use for rendering the map. It may be different than
the CRS of the data.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
index 80eaba0..49b3855 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
@@ -68,7 +68,7 @@ public class CoordinateOperationContext implements Serializable {
     private static final long serialVersionUID = -6944460471653277973L;
 
     /**
-     * The spatio-temporal area of interest, or {@code null} if none. This instance may be
updated or
+     * The spatiotemporal area of interest, or {@code null} if none. This instance may be
updated or
      * replaced by other methods in this class, or (indirectly) by {@link CoordinateOperationFinder}.
      */
     private Extent areaOfInterest;
@@ -131,9 +131,9 @@ public class CoordinateOperationContext implements Serializable {
     }
 
     /**
-     * Returns the spatio-temporal area of interest, or {@code null} if none.
+     * Returns the spatiotemporal area of interest, or {@code null} if none.
      *
-     * @return the spatio-temporal area of interest, or {@code null} if none.
+     * @return the spatiotemporal area of interest, or {@code null} if none.
      *
      * @see Extents#getGeographicBoundingBox(Extent)
      */
@@ -142,9 +142,9 @@ public class CoordinateOperationContext implements Serializable {
     }
 
     /**
-     * Sets the spatio-temporal area of interest, or {@code null} if none.
+     * Sets the spatiotemporal area of interest, or {@code null} if none.
      *
-     * @param  area  the spatio-temporal area of interest, or {@code null} if none.
+     * @param  area  the spatiotemporal area of interest, or {@code null} if none.
      */
     public void setAreaOfInterest(Extent area) {
         if (area != null) {
@@ -155,7 +155,7 @@ public class CoordinateOperationContext implements Serializable {
 
     /**
      * Sets the geographic component of the area of interest, or {@code null} if none.
-     * This convenience method set the bounding box into the spatio-temporal {@link Extent}.
+     * This convenience method set the bounding box into the spatiotemporal {@link Extent}.
      *
      * <p>The reverse operation can be done with <code>{@linkplain Extents#getGeographicBoundingBox(Extent)
      * Extents.getGeographicBoundingBox}({@linkplain #getAreaOfInterest()})</code>.</p>
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index e9cef89..c522d74 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@ -175,7 +175,7 @@ class CoordinateOperationRegistry {
     final DefaultCoordinateOperationFactory factorySIS;
 
     /**
-     * The spatio-temporal area of interest, or {@code null} if none.
+     * The spatiotemporal area of interest, or {@code null} if none.
      * When a new {@code CoordinateOperationFinder} instance is created with a non-null
      * {@link CoordinateOperationContext}, the context is used for initializing this value.
      * After initialization, this field may be updated as {@code CoordinateOperationFinder}
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
index 827d8a5..588ca24 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
@@ -16,9 +16,9 @@
  */
 
 /**
- * Matrix implementations for spatio-temporal referencing.
+ * Matrix implementations for spatiotemporal referencing.
  * Matrices can be of arbitrary size, but the most common ones in the context of geospatial
coordinate operations
- * are not greater than 5×5 (number of spatio-temporal dimensions + 1).
+ * are not greater than 5×5 (number of spatiotemporal dimensions + 1).
  * This package differs from other matrix packages by:
  *
  * <ul>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index b017868..c928371 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -774,7 +774,7 @@ public final strictfp class CoordinateOperationFinderTest extends MathTransformT
     }
 
     /**
-     * Tests extracting the vertical part of a spatio-temporal CRS.
+     * Tests extracting the vertical part of a spatiotemporal CRS.
      *
      * @throws FactoryException if the operation can not be created.
      * @throws TransformException if an error occurred while converting the test points.
@@ -918,7 +918,7 @@ public final strictfp class CoordinateOperationFinderTest extends MathTransformT
     }
 
     /**
-     * Tests conversion from spatio-temporal CRS to a derived CRS.
+     * Tests conversion from spatiotemporal CRS to a derived CRS.
      *
      * @throws FactoryException if the operation can not be created.
      * @throws TransformException if an error occurred while converting the test points.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java b/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
index ceb6330..0c22f0f 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
@@ -192,7 +192,7 @@ public final class ArgumentChecks extends Static {
     /**
      * Ensures that the given {@code values} array is non-null and non-empty. This method
can also ensures that all values
      * are between the given bounds (inclusive) and are distinct. The distinct values requirement
is useful for validating
-     * arrays of spatio-temporal dimension indices, where dimensions can not be repeated.
+     * arrays of spatiotemporal dimension indices, where dimensions can not be repeated.
      *
      * <p>Note that a successful call to {@code ensureNonEmpty(name, values, 0, max,
true)} implies
      * 1 ≦ {@code values.length} ≦ {@code max}.</p>
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Grid.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Grid.java
index ea4c3d2..6ac15b4 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Grid.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Grid.java
@@ -49,7 +49,7 @@ import org.apache.sis.util.ArraysExt;
  * A grid is associated to all variables that are georeferenced coverages and the same grid
may be shared
  * by many variables. The {@linkplain #getSourceDimensions() number of source dimensions}
is normally the
  * number of {@linkplain Variable#getGridDimensions() netCDF dimensions in the variable},
but may be less
- * if a variable dimensions should considered as bands instead than spatio-temporal dimensions.
+ * if a variable dimensions should considered as bands instead than spatiotemporal dimensions.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
index d482384..73ed965 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
@@ -105,11 +105,11 @@ public abstract class AbstractResource implements Resource, Localized
{
     }
 
     /**
-     * Returns the spatio-temporal envelope of this resource. This information is part of
API only in some kind of resources
+     * Returns the spatiotemporal envelope of this resource. This information is part of
API only in some kind of resources
      * like {@link org.apache.sis.storage.FeatureSet}. But the method is provided in this
base class for convenience and for
      * allowing {@link #getMetadata()} to use this information if available. The default
implementation returns {@code null}.
      *
-     * @return the spatio-temporal resource extent, or {@code null} if none.
+     * @return the spatiotemporal resource extent, or {@code null} if none.
      * @throws DataStoreException if an error occurred while reading or computing the envelope.
      */
     public Envelope getEnvelope() throws DataStoreException {
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
index 2557a06..63e4a20 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
@@ -146,13 +146,13 @@ public final class StoreUtilities extends Static {
     }
 
     /**
-     * Returns the spatio-temporal envelope of the given metadata.
+     * Returns the spatiotemporal envelope of the given metadata.
      * This method computes the union of all {@link GeographicBoundingBox} in the metadata,
assuming the
      * {@linkplain org.apache.sis.referencing.CommonCRS#defaultGeographic() default geographic
CRS}
      * (usually WGS 84).
      *
      * @param  metadata  the metadata from which to compute the envelope, or {@code null}.
-     * @return the spatio-temporal extent, or {@code null} if none.
+     * @return the spatiotemporal extent, or {@code null} if none.
      */
     public static Envelope getEnvelope(final Metadata metadata) {
         GeneralEnvelope bounds = null;
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
index 6212aae..4ed2d15 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
@@ -474,7 +474,7 @@ final class Store extends URIDataStore implements FeatureSet {
             envelope = new GeneralEnvelope(dim);
         }
         /*
-         * At this point we got the three- or four-dimensional spatio-temporal CRS.
+         * At this point we got the three- or four-dimensional spatiotemporal CRS.
          * We can now set the envelope coordinate values, including temporal values.
          */
         int dim;
@@ -545,7 +545,7 @@ final class Store extends URIDataStore implements FeatureSet {
                  * columns are not followed by a type. Those columns are:
                  *
                  *   1) mfidref     - used in order to identify the moving feature.
-                 *   2) trajectory  - defines the spatio-temporal geometry of moving features.
+                 *   2) trajectory  - defines the spatiotemporal geometry of moving features.
                  *                    Contains implicit "start time" and "end time" columns.
                  *
                  * Those two columns are mandatory in Moving Feature specification. All other
ones are optional.
@@ -668,7 +668,7 @@ final class Store extends URIDataStore implements FeatureSet {
     }
 
     /**
-     * Returns the spatio-temporal extent of CSV data in coordinate reference system of the
CSV file.
+     * Returns the spatiotemporal extent of CSV data in coordinate reference system of the
CSV file.
      */
     @Override
     public Envelope getEnvelope() throws DataStoreException {
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java
index d9ef1fa..696202e 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java
@@ -48,7 +48,7 @@ import org.opengis.geometry.Envelope;
  */
 public interface DataSet extends Resource {
     /**
-     * Returns the spatio-temporal extent of this resource in its most natural coordinate
reference system.
+     * Returns the spatiotemporal extent of this resource in its most natural coordinate
reference system.
      * The following relationship to {@linkplain #getMetadata()} should hold (departures
may exist):
      *
      * <ul>
@@ -70,7 +70,7 @@ public interface DataSet extends Resource {
      * <p>The returned envelope is not necessarily the smallest bounding box encompassing
all data.
      * If the smallest envelope is too costly to compute, this method may conservatively
return a larger envelope.</p>
      *
-     * @return the spatio-temporal resource extent. Should not be {@code null} (but may happen
if too costly to compute).
+     * @return the spatiotemporal resource extent. Should not be {@code null} (but may happen
if too costly to compute).
      * @throws DataStoreException if an error occurred while reading or computing the envelope.
      */
     Envelope getEnvelope() throws DataStoreException;
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
index 5a62011..a7c1336 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
@@ -80,7 +80,7 @@ public interface Resource {
     /**
      * Returns information about this resource.
      * If this resource is an {@link Aggregate}, then the metadata may enumerate characteristics
-     * (spatio-temporal extents, feature types, range dimensions, <i>etc.</i>)
of all
+     * (spatiotemporal extents, feature types, range dimensions, <i>etc.</i>)
of all
      * {@linkplain Aggregate#components() components} in the aggregate, or summarize them
(for example by omitting
      * {@linkplain org.apache.sis.metadata.iso.extent.DefaultExtent extents} that are fully
included in larger extents).
      * If this resource is a {@link DataSet}, then the metadata shall contain only the information
that apply to that
diff --git a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
index 4f0602f..ad2615e 100644
--- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
+++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
@@ -170,9 +170,9 @@ public final class Store extends StaxDataStore implements FeatureSet {
     }
 
     /**
-     * Returns the spatio-temporal envelope of this resource.
+     * Returns the spatiotemporal envelope of this resource.
      *
-     * @return the spatio-temporal resource extent.
+     * @return the spatiotemporal resource extent.
      * @throws DataStoreException if an error occurred while reading or computing the envelope.
      */
     @Override


Mime
View raw message