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 ebd3ddab597cf911ea6cc61c1b2ad9ef9a1e18b8 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Feb 17 12:15:02 2026 +0100 Renamed `TiledGridResource` as `TiledGridCoverageResource`. --- .../sis/storage/geotiff/CompressedSubset.java | 6 +- .../org/apache/sis/storage/geotiff/DataCube.java | 4 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 8 +-- .../sis/storage/tiling/TiledGridCoverage.java | 84 +++++++++++----------- ...esource.java => TiledGridCoverageResource.java} | 26 +++---- .../apache/sis/storage/geoheif/ImageResource.java | 10 +-- .../org/apache/sis/storage/gdal/TiledCoverage.java | 10 +-- .../org/apache/sis/storage/gdal/TiledResource.java | 4 +- 8 files changed, 76 insertions(+), 76 deletions(-) diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java index 48750c39b0..1eef4ee1a0 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java @@ -23,7 +23,7 @@ import java.awt.Point; import java.awt.image.Raster; import static java.lang.Math.toIntExact; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.storage.geotiff.inflater.Inflater; import org.apache.sis.image.DataType; import org.apache.sis.image.internal.shared.RasterFactory; @@ -99,7 +99,7 @@ final class CompressedSubset extends DataSubset { * @throws ArithmeticException if the number of tiles overflows 32 bits integer arithmetic. */ @SuppressWarnings("LocalVariableHidesMemberVariable") - CompressedSubset(final DataCube source, final TiledGridResource.Subset subset) throws DataStoreException { + CompressedSubset(final DataCube source, final TiledGridCoverageResource.Subset subset) throws DataStoreException { super(source, subset); long afterLastBand = sourceScanlineStride - sourcePixelStride; final int between = Math.multiplyExact(sourcePixelStride, Math.toIntExact(getSubsampling(xDimension) - 1)); @@ -200,7 +200,7 @@ final class CompressedSubset extends DataSubset { * in the bank. The `pixelsPerElement` factor is usually 1, except when more than one pixel is packed in * each single primitive type (e.g. 8 bits per byte in bilevel image). The `head` needs to be a multiple * of `pixelsPerElement`; this restriction is documented in `Inflater.skip(long)` and should have been - * verified by `TiledGridResource`. + * verified by `TiledGridCoverageResource`. */ final int pixelsPerElement = getPixelsPerElement(); // Always ≥ 1 and usually = 1. assert (head % pixelsPerElement) == 0 : head; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java index 79596fa269..3c408c4e70 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataCube.java @@ -31,7 +31,7 @@ import org.apache.sis.storage.geotiff.base.Resources; import org.apache.sis.storage.geotiff.base.Predictor; import org.apache.sis.storage.geotiff.base.Compression; import org.apache.sis.storage.tiling.TiledGridCoverage; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.storage.base.StoreResource; import org.apache.sis.math.Vector; @@ -47,7 +47,7 @@ import org.apache.sis.math.Vector; * * @author Martin Desruisseaux (Geomatys) */ -abstract class DataCube extends TiledGridResource implements StoreResource { +abstract class DataCube extends TiledGridCoverageResource implements StoreResource { /** * The GeoTIFF reader which contain this {@code DataCube}. * Used for fetching information like the input channel and where to report warnings. diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java index 09b2d4d990..d3ce404665 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java @@ -45,7 +45,7 @@ import org.apache.sis.image.internal.shared.RasterFactory; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.tiling.TiledGridCoverage; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.storage.geotiff.base.Resources; import org.apache.sis.storage.geotiff.reader.ReversedBitsChannel; import org.apache.sis.io.stream.Region; @@ -158,7 +158,7 @@ class DataSubset extends TiledGridCoverage implements Localized { * @param subset description of the {@code owner} subset to cover. * @throws ArithmeticException if the number of tiles overflows 32 bits integer arithmetic. */ - DataSubset(final DataCube source, final TiledGridResource.Subset subset) throws DataStoreException { + DataSubset(final DataCube source, final TiledGridCoverageResource.Subset subset) throws DataStoreException { super(subset); this.source = source; this.numTiles = toIntExact(source.getNumTiles()); @@ -496,7 +496,7 @@ class DataSubset extends TiledGridCoverage implements Localized { * The default implementation in this base class assumes uncompressed data without band subset. * Subsampling on the <var>X</var> axis is not supported if the image has interleaved pixels. * Packed pixels (é.g. bilevel images with 8 pixels per byte) are not supported. - * Those restrictions are verified by {@link DataCube#canReadDirect(TiledGridResource.Subset)}. + * Those restrictions are verified by {@link DataCube#canReadDirect(TiledGridCoverageResource.Subset)}. * Subclasses must override for handling decompression or for resolving above-cited limitations. * * @todo It is possible to relax a little bit some restrictions. If the tile width is a divisor @@ -516,7 +516,7 @@ class DataSubset extends TiledGridCoverage implements Localized { * @throws RuntimeException if the Java2D image cannot be created for another reason * (too many exception types to list them all). * - * @see DataCube#canReadDirect(TiledGridResource.Subset) + * @see DataCube#canReadDirect(TiledGridCoverageResource.Subset) */ Raster readSlice(final long[] offsets, final long[] byteCounts, final long[] lower, final long[] upper, final long[] subsampling, final Point location) throws IOException, DataStoreException diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverage.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverage.java index 40e9648e9d..68a989962a 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverage.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverage.java @@ -70,7 +70,7 @@ import org.opengis.coordinate.MismatchedDimensionException; * Conversions can be done by {@link #coverageToResourceCoordinate(long, int)}. * * <p><b>Design note:</b> {@code TiledGridCoverage} uses the same cell coordinates as the originating - * {@link TiledGridResource} (when no subsampling) because those two classes use {@code long} integers. + * {@link TiledGridCoverageResource} (when no subsampling) because those two classes use {@code long} integers. * There is no integer overflow to avoid, contrarily to tile indices described below.</p> * * <h2>Tile matrix coordinate (<abbr>TMC</abbr>)</h2> @@ -86,7 +86,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * The area to read in unit of the full coverage (without subsampling). * This is the intersection between user-specified domain and the source - * {@link TiledGridResource} domain, expanded to an integer number of chunks. + * {@link TiledGridCoverageResource} domain, expanded to an integer number of chunks. * A chunk size is usually a tile size, but not necessarily as there is other * criteria to take in account such as "atom" size and subsampling. * @@ -104,7 +104,7 @@ public abstract class TiledGridCoverage extends GridCoverage { * However, there is a few exceptions where the read extent should not be forced to the tile size: * * <ul> - * <li>If the image is untiled, then the {@link org.apache.sis.storage.base.TiledGridResource.Subset} + * <li>If the image is untiled, then the {@link org.apache.sis.storage.base.TiledGridCoverageResource.Subset} * constructor assumes that only the requested region of the tile will be read.</li> * <li>If the tile is truncated on the storage as well * (note: this is rare. GeoTIFF for example always stores whole tiles).</li> @@ -123,17 +123,17 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Size of all tiles in the domain of this {@code TiledGridCoverage}, without sub-sampling. - * All coverages created from the same {@link TiledGridResource} shall have the same tile size values. + * All coverages created from the same {@link TiledGridCoverageResource} shall have the same tile size values. * The length of this array is the number of dimensions in the source {@link GridExtent}. * This is often {@value #BIDIMENSIONAL} but can also be more. * * <h4>What is a "virtual" size</h4> * The tile size stored in this field is usually the size of tiles used by the binary encoding of the file - * which is read by {@link TiledGridResource}. However, this tile size may differ in two circumstances. + * which is read by {@link TiledGridCoverageResource}. However, this tile size may differ in two circumstances. * In such case, this tile size is said "virtual". * * <h5>Tiles coalescence</h5> - * The first circumstance is when the {@link TiledGridResource} subclass + * The first circumstance is when the {@link TiledGridCoverageResource} subclass * decided to coalesce many tiles from the file in bigger tiles in memory. * This is sometime useful when a sub-sampling is applied, * for avoiding that the sub-sampled tiles become too small. @@ -151,7 +151,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Values by which to multiply each tile coordinates for obtaining the index in the tile vector. * The length of this array is the same as {@link #virtualTileSize}. All coverages created from - * the same {@link TiledGridResource} have the same stride values. + * the same {@link TiledGridCoverageResource} have the same stride values. */ private final int[] tileStrides; @@ -163,7 +163,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * The Tile Matrix Coordinates (<abbr>TMC</abbr>) that tile (0,0) of this coverage - * would have in the originating {@code TiledGridResource}. + * would have in the originating {@code TiledGridCoverageResource}. * This is the value to subtract from tile indices computed from cell coordinates. * * <p>The current implementation assumes that the tile (0,0) in the resource starts @@ -193,8 +193,8 @@ public abstract class TiledGridCoverage extends GridCoverage { private final long[] subsampling, subsamplingOffsets; /** - * Indices of {@link TiledGridResource} bands which have been retained for - * inclusion in this {@code TiledGridCoverage}, in strictly increasing order. + * Indices of {@link TiledGridCoverageResource} bands which have been retained + * for inclusion in this {@code TiledGridCoverage}, in strictly increasing order. * An included band is stored in memory but not necessarily visible to users, * depending on how the {@link SampleModel} uses each band. * This array is {@code null} if all bands shall be included. @@ -208,7 +208,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * The dimension of the grid which is mapped to the <var>x</var> axis (column indexes) in rendered images. * This is the value of the {@code xDimension} argument in the last call to the - * {@link TiledGridResource#setRasterDimension(int, int)} method before this coverage has been constructed. + * {@link TiledGridCoverageResource#setRasterDimension(int, int)} method before this coverage has been constructed. * This value is usually 0. * * @see #readTiles(TileIterator) @@ -218,7 +218,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * The dimension of the grid which is mapped to the <var>y</var> axis (row indexes) in rendered images. * This is the value of the {@code yDimension} argument in the last call to the - * {@link TiledGridResource#setRasterDimension(int, int)} method before this coverage has been constructed. + * {@link TiledGridCoverageResource#setRasterDimension(int, int)} method before this coverage has been constructed. * This value is usually 1. * * @see #readTiles(TileIterator) @@ -227,14 +227,14 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Cache of rasters read by this {@code TiledGridCoverage}. This cache may be shared with other coverages - * created for the same {@link TiledGridResource} resource. For each value, the raster {@code minX} and + * created for the same {@link TiledGridCoverageResource} resource. For each value, the raster {@code minX} and * {@code minY} values can be anything, depending which {@code TiledGridCoverage} was first to load the tile. * - * @see TiledGridResource#rasters + * @see TiledGridCoverageResource#rasters * @see AOI#getCachedTile() * @see #createCacheKey(int) */ - private final WeakValueHashMap<TiledGridResource.CacheKey, Raster> rasters; + private final WeakValueHashMap<TiledGridCoverageResource.CacheKey, Raster> rasters; /** * The sample model for all rasters. The width and height of this sample model are computed @@ -242,14 +242,14 @@ public abstract class TiledGridCoverage extends GridCoverage { * The components may be a subset of the bands in the resource if the user requested to read * only a subset of those bands. * - * @see TiledGridResource#getSampleModel(int[]) + * @see TiledGridCoverageResource#getSampleModel(int[]) */ protected final SampleModel model; /** * The Java2D color model for images rendered from this coverage. * - * @see TiledGridResource#getColorModel(int[]) + * @see TiledGridCoverageResource#getColorModel(int[]) */ protected final ColorModel colors; @@ -257,26 +257,26 @@ public abstract class TiledGridCoverage extends GridCoverage { * The values to use for filling empty spaces in rasters, or {@code null} if zero in all bands. * If non-null, the array length is equal to the number of bands. * - * @see TiledGridResource#getFillValues(int[]) + * @see TiledGridCoverageResource#getFillValues(int[]) */ protected final Number[] fillValues; /** * Whether the reading of tiles is deferred until {@link RenderedImage#getTile(int, int)} is invoked. - * This is true if the user explicitly {@linkplain TiledGridResource#setLoadingStrategy requested such - * deferred loading strategy} and the resource considers that it is worth to do so. + * This is true if the user explicitly {@linkplain TiledGridCoverageResource#setLoadingStrategy requested + * such deferred loading strategy} and the resource considers that it is worth to do so. */ private final boolean deferredTileReading; /** * Creates a new tiled grid coverage. This constructor does not load any tile. * - * @param subset description of the {@link TiledGridResource} subset to cover. + * @param subset description of the {@link TiledGridCoverageResource} subset to cover. * @throws ArithmeticException if the number of tiles overflows 32 bits integer arithmetic. * - * @see TiledGridResource#read(TiledGridResource.Subset) + * @see TiledGridCoverageResource#read(TiledGridCoverageResource.Subset) */ - protected TiledGridCoverage(final TiledGridResource.Subset subset) { + protected TiledGridCoverage(final TiledGridCoverageResource.Subset subset) { super(subset.domain, subset.ranges); xDimension = subset.xDimension(); yDimension = subset.yDimension(); @@ -360,10 +360,10 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Returns the size of all tiles in the domain of this {@code TiledGridCoverage}, without sub-sampling. - * This is usually the same size as the tiles in the storage which is read by {@link TiledGridResource}, - * but not necessarily. It may be larger if the {@link TiledGridResource} subclass decided to coalesce - * many real tiles into larger virtual tiles, or it may be smaller when reading a sub-region of an - * effectively untiled coverage. + * This is usually the same size as the tiles in the storage which is read by {@link TiledGridCoverageResource}, + * but not necessarily. It may be larger if the {@link TiledGridCoverageResource} subclass decided to + * coalesce many real tiles into larger virtual tiles, or it may be smaller when reading a sub-region + * of an effectively untiled coverage. * * @param dimension dimension for which to get tile size. * @return tile size in the given dimension, without clipping and subsampling. @@ -408,14 +408,14 @@ public abstract class TiledGridCoverage extends GridCoverage { } /** - * Converts a cell coordinate of this coverage to the {@code TiledGridResource} coordinate space. + * Converts a cell coordinate of this coverage to the {@code TiledGridCoverageResource} coordinate space. * This method removes the subsampling effect, * i.e. returns the coordinate that we would have if this coverage was at full resolution. * The result is the given {@code coordinate} value unchanged when there is no subsampling. * * @param coordinate coordinate in this {@code TiledGridCoverage} domain. * @param dimension the dimension of the coordinate to convert. - * @return coordinate in the {@code TiledGridResource} domain with no subsampling applied. + * @return coordinate in the {@code TiledGridCoverageResource} domain with no subsampling applied. * @throws ArithmeticException if the coordinate cannot be represented as a 64 bits integer. */ protected final long coverageToResourceCoordinate(final long coordinate, final int dimension) { @@ -423,12 +423,12 @@ public abstract class TiledGridCoverage extends GridCoverage { } /** - * Converts a cell coordinate from the {@code TiledGridResource} to this coverage coordinate space. + * Converts a cell coordinate from the {@code TiledGridCoverageResource} to this coverage coordinate space. * This method is the converse of {@link #coverageToResourceCoordinate(long, int)}. * The result is the given {@code coordinate} value unchanged when there is no subsampling. * If there is a subsampling, the returned value is rounded toward negative infinity. * - * @param coordinate coordinate in the {@code TiledGridResource} domain. + * @param coordinate coordinate in the {@code TiledGridCoverageResource} domain. * @param dimension the dimension of the coordinate to convert. * @return coordinates in this subsampled {@code TiledGridCoverage} domain. * @throws ArithmeticException if the coordinate cannot be represented as a 64 bits integer. @@ -454,7 +454,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Converts a cell coordinate from this {@code TiledGridCoverage} coordinate space to * the Tile Matrix Coordinate (<abbr>TMC</abbr>) of the tile which contains that cell. - * The returned <abbr>TMC</abbr> is relative to the full {@link TiledGridResource}, + * The returned <abbr>TMC</abbr> is relative to the full {@link TiledGridCoverageResource}, * i.e. without subtraction of {@link #tmcOfFirstTile}. * * @param coordinate coordinates in this {@code TiledGridCoverage} domain. @@ -645,7 +645,7 @@ public abstract class TiledGridCoverage extends GridCoverage { int indexInResultArray; /** - * Current iterator position as an index in the vector of tiles in the {@link TiledGridResource}. + * Current iterator position as an index in the vector of tiles in the {@link TiledGridCoverageResource}. * Tiles are assumed stored in a row-major fashion. This field is incremented by calls to {@link #next()}. * This index is also used as key in the {@link TiledGridCoverage#rasters} map. * @@ -869,7 +869,7 @@ public abstract class TiledGridCoverage extends GridCoverage { * * <h4>Subsampling</h4> * If the {@code subsampled} argument is {@code false}, then this method returns coordinates - * relative to the tile in the originating {@link TiledGridResource}, i.e. without subsampling. + * relative to the tile in the originating {@link TiledGridCoverageResource}, i.e. without subsampling. * If {@code subsampled} is {@code true}, then this method returns coordinates relative to the * {@linkplain #createRaster() raster}, i.e. with {@linkplain #getSubsampling(int) subsampling}. * @@ -1154,7 +1154,7 @@ public abstract class TiledGridCoverage extends GridCoverage { * @param coordinate pixel coordinate in the {@link RenderedImage} coordinate system. * @param dimension the dimension of the coordinate to convert. * @param ceil {@code true} for rounding up, or {@code false} for rounding down. - * @return cell coordinate in the {@link TiledGridResource} coordinate system. + * @return cell coordinate in the {@link TiledGridCoverageResource} coordinate system. */ private long resourceToImage(long coordinate, final int dimension, final boolean ceil) { coordinate = subtractExact(coordinate, coverageTileToResourceCell(tileLower[dimension], dimension)); @@ -1171,7 +1171,7 @@ public abstract class TiledGridCoverage extends GridCoverage { * * @param coordinate pixel coordinate in the {@link RenderedImage} coordinate system. * @param dimension the dimension of the coordinate to convert. - * @return cell coordinate in the {@link TiledGridResource} coordinate system. + * @return cell coordinate in the {@link TiledGridCoverageResource} coordinate system. */ private long imageToResource(long coordinate, final int dimension) { coordinate = subtractExact(coordinate, offsetAOI[dimension]); // (0,0) at image origin instead of AOI. @@ -1358,8 +1358,8 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Creates the key to use for caching the tile at given index. */ - private TiledGridResource.CacheKey createCacheKey(final int indexInTileVector) { - return new TiledGridResource.CacheKey(indexInTileVector, includedBands, subsampling, subsamplingOffsets); + private TiledGridCoverageResource.CacheKey createCacheKey(final int indexInTileVector) { + return new TiledGridCoverageResource.CacheKey(indexInTileVector, includedBands, subsampling, subsamplingOffsets); } /** @@ -1374,7 +1374,7 @@ public abstract class TiledGridCoverage extends GridCoverage { * Caches the given raster. See {@link AOI#cache(Raster)} for more information. */ private Raster cacheTile(final int indexInTileVector, final Raster tile) { - final TiledGridResource.CacheKey key = createCacheKey(indexInTileVector); + final TiledGridCoverageResource.CacheKey key = createCacheKey(indexInTileVector); Raster existing = rasters.put(key, tile); /* * If a tile already exists, verify if its layout is compatible with the given tile. @@ -1402,7 +1402,7 @@ public abstract class TiledGridCoverage extends GridCoverage { /** * Returns all tiles in the given area of interest. Tile indices are relative to this {@code TiledGridCoverage}: * (0,0) is the tile in the upper-left corner of this {@code TiledGridCoverage} (not necessarily the upper-left - * corner of the image in the {@link TiledGridResource}). + * corner of the image in the {@link TiledGridCoverageResource}). * * <p>The {@link Raster#getMinX()} and {@code getMinY()} coordinates of returned rasters * shall start at the values given by {@link TileIterator#getTileOrigin(int)}. @@ -1414,10 +1414,10 @@ public abstract class TiledGridCoverage extends GridCoverage { * These dimensions are usually 0 and 1 respectively.</p> * * <p>This method must be thread-safe. It is implementer responsibility to ensure synchronization, - * for example using {@link TiledGridResource#getSynchronizationLock()}.</p> + * for example using {@link TiledGridCoverageResource#getSynchronizationLock()}.</p> * * @param iterator an iterator over the tiles that intersect the Area Of Interest specified by user. - * @return tiles decoded from the {@link TiledGridResource}. + * @return tiles decoded from the {@link TiledGridCoverageResource}. * @throws Exception if the tile cannot be created. There is too many possible exceptions for listing all types, * but the main ones are {@link java.io.IOException} for I/O errors and various {@link RuntimeException} * subtypes for Java2D errors. diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverageResource.java similarity index 97% rename from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridResource.java rename to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverageResource.java index 72e2ffc996..3507103dac 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TiledGridCoverageResource.java @@ -76,7 +76,7 @@ import org.opengis.coverage.CannotEvaluateException; * @version 1.7 * @since 1.7 */ -public abstract class TiledGridResource extends AbstractGridCoverageResource { +public abstract class TiledGridCoverageResource extends AbstractGridCoverageResource { /** * Number of dimensions in a rendered image. * Used for identifying codes where a two-dimensional slice is assumed. @@ -88,7 +88,7 @@ public abstract class TiledGridResource extends AbstractGridCoverageResource { /** * A key in the {@link #rasters} cache of tiles. - * Each key shall be unique within its enclosing {@link TiledGridResource} instance. + * Each key shall be unique within its enclosing {@link TiledGridCoverageResource} instance. */ static final class CacheKey { /** Index in a row-major array of tiles. */ private final int indexInTileVector; @@ -131,7 +131,7 @@ public abstract class TiledGridResource extends AbstractGridCoverageResource { * All tiles loaded by any {@link TiledGridCoverage} created from this resource. * Keys contains tile indices in a row-major array of tiles. * For each value, the {@link Raster#getMinX()} and {@code minY} values - * can be anything, depending which {@link TiledGridResource} was first to load the tile. + * can be anything, depending which {@link TiledGridCoverageResource} was first to load the tile. * * @see TiledGridCoverage#rasters * @see TiledGridCoverage.AOI#getCachedTile() @@ -169,7 +169,7 @@ public abstract class TiledGridResource extends AbstractGridCoverageResource { * * @param parent the parent resource, or {@code null} if none. */ - protected TiledGridResource(final Resource parent) { + protected TiledGridCoverageResource(final Resource parent) { super(parent); yDimension = 1; processor = new GridCoverageProcessor(); @@ -433,12 +433,12 @@ check: if (dataType.isInteger()) { /** * Parameters that describe the resource subset to be accepted by the {@link TiledGridCoverage} constructor. - * Instances of this class are temporary and used only for transferring information from {@link TiledGridResource} + * Instances of this class are temporary and used only for transferring information from {@link TiledGridCoverageResource} * to {@link TiledGridCoverage}. This class does not perform I/O operations. */ public final class Subset { /** - * The full size of the coverage in the enclosing {@link TiledGridResource}. + * The full size of the coverage in the enclosing {@link TiledGridCoverageResource}. * This is taken from {@link #getGridGeometry()} and does not take sub-sampling in account. */ final GridExtent sourceExtent; @@ -446,7 +446,7 @@ check: if (dataType.isInteger()) { /** * The area to read in unit of the full coverage (without subsampling). * This is the intersection between user-specified domain and enclosing - * {@link TiledGridResource} domain, expanded to an integer number of chunks. + * {@link TiledGridCoverageResource} domain, expanded to an integer number of chunks. * A chunk size is usually a tile size, but not necessarily as there is other * criteria to take in account such as "atom" size and subsampling. */ @@ -469,7 +469,7 @@ check: if (dataType.isInteger()) { final List<? extends SampleDimension> ranges; /** - * Indices of {@link TiledGridResource} bands which have been retained for inclusion + * Indices of {@link TiledGridCoverageResource} bands which have been retained for inclusion * in the {@link TiledGridCoverage} to construct, in strictly increasing order. * An "included" band is stored in memory but not necessarily visible to the user, * because the {@link SampleModel} can be configured for ignoring some bands. @@ -485,13 +485,13 @@ check: if (dataType.isInteger()) { /** * Coordinate conversion from subsampled grid to the grid at full resolution. - * This array contains the factors by which to divide {@link TiledGridResource} + * This array contains the factors by which to divide {@link TiledGridCoverageResource} * cell coordinates in order to obtain {@link TiledGridCoverage} cell coordinates. */ final long[] subsampling; /** - * Remainder of the divisions of {@link TiledGridResource} cell coordinates by subsampling factors. + * Remainder of the divisions of {@link TiledGridCoverageResource} cell coordinates by subsampling factors. */ final long[] subsamplingOffsets; @@ -528,7 +528,7 @@ check: if (dataType.isInteger()) { /** * Cache to use for tiles loaded by the {@link TiledGridCoverage}. - * It is a reference to {@link TiledGridResource#rasters} if shareable. + * It is a reference to {@link TiledGridCoverageResource#rasters} if shareable. */ final WeakValueHashMap<CacheKey, Raster> cache; @@ -539,7 +539,7 @@ check: if (dataType.isInteger()) { * @param range the range argument specified by user in a call to {@code GridCoverageResource.read(…)}. * * @throws ArithmeticException if pixel indices exceed 64 bits integer capacity. - * @throws DataStoreException if a call to {@link TiledGridResource} method failed. + * @throws DataStoreException if a call to {@link TiledGridCoverageResource} method failed. * @throws RasterFormatException if the sample model is not recognized. * @throws IllegalArgumentException if an error occurred in an operation * such as creating the {@code SampleModel} subset for selected bands. @@ -551,7 +551,7 @@ check: if (dataType.isInteger()) { /* * Normally, the number of dimensions of `tileSize` should be equal to the number of dimensions * of the grid geometry (determined by its `GridExtent`). However, we are tolerant to situation - * where the `TiledGridResource` is a two dimensional image associated to a 3-dimensional CRS. + * where the `TiledGridCoverageResource` is a two dimensional image associated to a 3-dimensional CRS. * This is not recommended, but can happen with GeoTIFF for example. What to do with the extra * dimension is unclear (the GeoTIFF specification itself said nothing), so we just ignore it. */ diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageResource.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageResource.java index 2f869225b6..d624101ad3 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageResource.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ImageResource.java @@ -41,7 +41,7 @@ import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.base.StoreResource; import org.apache.sis.storage.tiling.TiledGridCoverage; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.storage.isobmff.ByteRanges; import org.apache.sis.io.stream.ChannelDataInput; @@ -52,7 +52,7 @@ import org.apache.sis.io.stream.ChannelDataInput; * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) */ -final class ImageResource extends TiledGridResource implements StoreResource { +final class ImageResource extends TiledGridCoverageResource implements StoreResource { /** * The data store that produced this resource. * @@ -274,10 +274,10 @@ final class ImageResource extends TiledGridResource implements StoreResource { /** * Creates a new tiled grid coverage. * - * @param subset description of the {@link TiledGridResource} subset to cover. + * @param subset description of the {@link TiledGridCoverageResource} subset to cover. * @throws ArithmeticException if the number of tiles overflows 32 bits integer arithmetic. */ - Coverage(TiledGridResource.Subset subset) { + Coverage(TiledGridCoverageResource.Subset subset) { super(subset); } @@ -292,7 +292,7 @@ final class ImageResource extends TiledGridResource implements StoreResource { /** * Returns all tiles in the given area of interest. Tile indices are relative to this {@code Coverage}: * (0,0) is the tile in the upper-left corner of this {@code Coverage} (not necessarily the upper-left - * corner of the image in the {@link TiledGridResource}). This method must be thread-safe. + * corner of the image in the {@link TiledGridCoverageResource}). This method must be thread-safe. * * @param iterator an iterator over the tiles that intersect the Area Of Interest specified by user. * @return tiles decoded from the enclosing resource. diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java index 59c990133b..7fbe56ac17 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java @@ -26,7 +26,7 @@ import org.opengis.util.GenericName; import org.apache.sis.util.logging.Logging; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.tiling.TiledGridCoverage; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; // Test dependencies import org.apache.sis.image.internal.shared.AssertionMessages; @@ -47,9 +47,9 @@ final class TiledCoverage extends TiledGridCoverage { * Creates a new tiled grid coverage. * * @param owner the resource from which this coverage has been read. - * @param subset description of the {@link TiledGridResource} subset to cover. + * @param subset description of the {@link TiledGridCoverageResource} subset to cover. */ - TiledCoverage(final TiledResource owner, final TiledGridResource.Subset subset) { + TiledCoverage(final TiledResource owner, final TiledGridCoverageResource.Subset subset) { super(subset); this.owner = owner; } @@ -72,12 +72,12 @@ final class TiledCoverage extends TiledGridCoverage { /** * Returns all tiles in the given area of interest. Tile indices (0,0) locates the tile in the upper-left corner - * of this {@code TiledGridCoverage} (not necessarily the upper-left corner of the {@link TiledGridResource}). + * of this {@code TiledGridCoverage} (not necessarily the upper-left corner of the {@link TiledGridCoverageResource}). * The {@link Raster#getMinX()} and {@code getMinY()} coordinates of returned rasters * shall start at the given {@code iterator.offsetAOI} values. * * @param iterator an iterator over the tiles that intersect the Area Of Interest specified by user. - * @return tiles decoded from the {@link TiledGridResource}. + * @return tiles decoded from the {@link TiledGridCoverageResource}. * @throws ArithmeticException if an integer overflow occurred. */ @Override diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java index 2707239a77..4d4b16c684 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java @@ -49,7 +49,7 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.base.MetadataBuilder; import org.apache.sis.storage.tiling.TiledGridCoverage; -import org.apache.sis.storage.tiling.TiledGridResource; +import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.system.Configuration; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.resources.Vocabulary; @@ -64,7 +64,7 @@ import org.apache.sis.util.resources.Vocabulary; * @author Quentin Bialota (Geomatys) * @author Martin Desruisseaux (Geomatys) */ -final class TiledResource extends TiledGridResource { +final class TiledResource extends TiledGridCoverageResource { /** * Arbitrary number of pixels for considering a tile as too large. * Tile larger than this size will be divided in smaller tiles.
