You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/02/23 13:52:42 UTC
[sis] branch master updated (f460fa5 -> 5187b15)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git.
from f460fa5 Merge branch 'geoapi-3.1'
add 9318a74 A LinearTransform between two PassThroughTransform instances should not block us from merging those two instances.
add ab39649 Ignore blank strings in some netCDF attributes.
add 5cea2e3 Remove methods from Decoder that were just redirections to Convention methods.
add 336d301 refactor(NetCDF): Move some logic for Grid sample dimension building from GridResource to Convention
add 4d77052 fix(NetCDF): When using Ucar, check variable description is not empty when queried.
add 9a0a24a chore(NetCDF): add missing JavaDoc on a method.
add 6db4039 Refactor Variable.getValidValues() by moving more code to Convention and making clear that the remaining code in Variable is used only as a fallback. Move back GridResource.addQuantitativeInfo(…) into createSampleDimension(…) for now since they work together in building a SampleDimension and may share more information in the future. In particular, the code in Variable.getRangeFallback() which avoid collision with "no data value" may move into GridResource.createSampleDim [...]
add ebfc3ca Clarification in javadoc: the size of the list returned by getSampleDimensions() should be equal to the number of bands in the image.
add ebb7e86 Replace Variable.getShape(), Variable.getGridDimensionNames() and Grid.getShape() methods by a method returning a list of Dimension objects.
add 1cf91df First draft of a Variable.getGridDimensions(…) capable to handle grid dimensions that are not the same than the variable dimensions.
add 13e0760 Move Variable.getRole() implementation into Convention.roleOf(Variable).
add 140595a More advanced support of localization grids having different dimensions than the data variable.
add ba593a6 Bug fix in recognition of localization grid of different size than the data grid. It requires among others a Dimension.hashCode() implementation.
add 5a1a8b2 Fix inversion of (latitude, longitude) axes in some cases: Grid.getGridGeometry(…) need to check which source dimension is first before to invoke Axis.createLocalizationGrid(…).
add f0a2257 If the dimensions of the localization grid do not match the dimensions of the data, a scale factor needs to be applied when conversing grid indices to data indices.
add f8a6001 Do not build a GridGeometry if a "resampling_interval" attribute was required but not found.
add 85928b6 feat(NetCDF): Allow for custom search paths and attribute names per convention.
add bc1c422 Merge branch 'geoapi-4.0' into feat/netcdf-attribute-names
add a972b83 Merge branch 'feat/netcdf-attribute-names' of https://github.com/alexismanin/sis into geoapi-4.0. Changes have been applied regarding methods order, documentation, and where the search path is set.
add 48016f7 Restore public visibility on Variable.read().
add 38ff68a Fix indentation.
add a9bf411 Rename two Convention methods for consistency with other methods.
add e59aac9 Fix a NullPointerException when sample values have integers greater than 65535.
add fcb4b84 Fix a NullPointerException occurring during execution of Convention.isApplicableTo(Decoder).
add bdb58f7 Fix a NoSuchElementException in Convention.find(Decoder). Remove the comment about synchronization and the synchronized statement, since we are using LazySet workaround.
add 567ff8b Update dependency to UCAR netCDF library.
add 9fe6378 Coverage : fix discret short overflow in ColorModelFactory
add 977ff0d Restore the resizing of array based on the actual number of elements.
add c8abdcf Move Variable.getNodataValues() implementation into Convention for allowing overriding. This move forces us to retain a reference to Decoder into Variable in order to get the conventions.
add a029082 Variable.hasRealValues() should take in account the transfer function that may be overridden in Convention. Add a Variable.getRole() convenience method.
add 40b7f1b Provide warning in some situations where the netCDF reader can not create a GridGeometry or a SampleDimension.
add 1a68bc5 Consider the "N/A" value returned by some UCAR methods as null.
add e4aede8 Make interpretation of attribute value robust to the case where the value is unsigned.
add b818b0e Merge branch 'geoapi-4.0' into geoapi-3.1
new 5187b15 Merge branch 'geoapi-3.1'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/coverage/grid/GridCoverage.java | 10 +
.../apache/sis/coverage/grid/GridDerivation.java | 123 ++++-
.../org/apache/sis/coverage/grid/GridExtent.java | 46 +-
.../sis/internal/raster/ColorModelFactory.java | 40 +-
.../sis/coverage/grid/GridDerivationTest.java | 32 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 12 +
.../operation/transform/MathTransforms.java | 7 +-
.../operation/transform/PassThroughTransform.java | 47 +-
.../operation/transform/TransferFunction.java | 15 +
.../transform/PassThroughTransformTest.java | 2 +-
.../operation/transform/TransferFunctionTest.java | 5 +
.../org/apache/sis/internal/util/Numerics.java | 16 +
.../java/org/apache/sis/measure/NumberRange.java | 4 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 2 +-
.../java/org/apache/sis/internal/netcdf/Axis.java | 21 +-
.../org/apache/sis/internal/netcdf/Convention.java | 364 +++++++++++++-
.../org/apache/sis/internal/netcdf/Decoder.java | 50 +-
.../org/apache/sis/internal/netcdf/Dimension.java | 107 +++++
.../java/org/apache/sis/internal/netcdf/Grid.java | 133 ++++--
.../org/apache/sis/internal/netcdf/Resources.java | 24 +-
.../sis/internal/netcdf/Resources.properties | 7 +-
.../sis/internal/netcdf/Resources_fr.properties | 7 +-
.../org/apache/sis/internal/netcdf/Variable.java | 524 +++++++++++++--------
.../sis/internal/netcdf/impl/ChannelDecoder.java | 72 ++-
.../impl/{Dimension.java => DimensionInfo.java} | 24 +-
.../sis/internal/netcdf/impl/FeaturesInfo.java | 4 +-
.../apache/sis/internal/netcdf/impl/GridInfo.java | 64 ++-
.../sis/internal/netcdf/impl/VariableInfo.java | 126 +++--
.../sis/internal/netcdf/ucar/DecoderWrapper.java | 46 +-
.../sis/internal/netcdf/ucar/DimensionWrapper.java | 111 +++++
.../sis/internal/netcdf/ucar/GridWrapper.java | 89 +++-
.../org/apache/sis/internal/netcdf/ucar/Utils.java | 85 ++++
.../sis/internal/netcdf/ucar/VariableWrapper.java | 144 +++---
.../apache/sis/storage/netcdf/GridResource.java | 133 ++++--
.../apache/sis/storage/netcdf/MetadataReader.java | 31 +-
.../apache/sis/internal/netcdf/VariableTest.java | 39 +-
.../apache/sis/storage/GridCoverageResource.java | 10 +
38 files changed, 1889 insertions(+), 689 deletions(-)
create mode 100644 storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Dimension.java
rename storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/{Dimension.java => DimensionInfo.java} (79%)
create mode 100644 storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DimensionWrapper.java
create mode 100644 storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/Utils.java
[sis] 01/01: Merge branch 'geoapi-3.1'
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 5187b15cd6b0e5b85b6e839c102307994db05639
Merge: f460fa5 b818b0e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Feb 23 14:51:29 2019 +0100
Merge branch 'geoapi-3.1'
.../org/apache/sis/coverage/grid/GridCoverage.java | 10 +
.../apache/sis/coverage/grid/GridDerivation.java | 123 ++++-
.../org/apache/sis/coverage/grid/GridExtent.java | 46 +-
.../sis/internal/raster/ColorModelFactory.java | 40 +-
.../sis/coverage/grid/GridDerivationTest.java | 32 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 12 +
.../operation/transform/MathTransforms.java | 7 +-
.../operation/transform/PassThroughTransform.java | 47 +-
.../operation/transform/TransferFunction.java | 15 +
.../transform/PassThroughTransformTest.java | 2 +-
.../operation/transform/TransferFunctionTest.java | 5 +
.../org/apache/sis/internal/util/Numerics.java | 16 +
.../java/org/apache/sis/measure/NumberRange.java | 4 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 2 +-
.../java/org/apache/sis/internal/netcdf/Axis.java | 21 +-
.../org/apache/sis/internal/netcdf/Convention.java | 364 +++++++++++++-
.../org/apache/sis/internal/netcdf/Decoder.java | 50 +-
.../org/apache/sis/internal/netcdf/Dimension.java | 107 +++++
.../java/org/apache/sis/internal/netcdf/Grid.java | 133 ++++--
.../org/apache/sis/internal/netcdf/Resources.java | 24 +-
.../sis/internal/netcdf/Resources.properties | 7 +-
.../sis/internal/netcdf/Resources_fr.properties | 7 +-
.../org/apache/sis/internal/netcdf/Variable.java | 524 +++++++++++++--------
.../sis/internal/netcdf/impl/ChannelDecoder.java | 72 ++-
.../impl/{Dimension.java => DimensionInfo.java} | 24 +-
.../sis/internal/netcdf/impl/FeaturesInfo.java | 4 +-
.../apache/sis/internal/netcdf/impl/GridInfo.java | 64 ++-
.../sis/internal/netcdf/impl/VariableInfo.java | 126 +++--
.../sis/internal/netcdf/ucar/DecoderWrapper.java | 46 +-
.../sis/internal/netcdf/ucar/DimensionWrapper.java | 111 +++++
.../sis/internal/netcdf/ucar/GridWrapper.java | 89 +++-
.../org/apache/sis/internal/netcdf/ucar/Utils.java | 85 ++++
.../sis/internal/netcdf/ucar/VariableWrapper.java | 144 +++---
.../apache/sis/storage/netcdf/GridResource.java | 133 ++++--
.../apache/sis/storage/netcdf/MetadataReader.java | 31 +-
.../apache/sis/internal/netcdf/VariableTest.java | 39 +-
.../apache/sis/storage/GridCoverageResource.java | 10 +
38 files changed, 1889 insertions(+), 689 deletions(-)
diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index b5f47f0,b16f8ef..167b4cb
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@@ -938,10 -942,12 +935,12 @@@ split: while ((start = CharSequences.s
newSampleDimension();
final String name = trim(variable.getName());
if (name != null) {
- final NameFactory f = decoder.nameFactory;
+ final DefaultNameFactory f = decoder.nameFactory;
- setBandIdentifier(f.createMemberName(null, name, f.createTypeName(null, variable.getDataTypeName())));
+ final StringBuilder buffer = new StringBuilder(20);
+ variable.writeDataTypeName(buffer);
+ setBandIdentifier(f.createMemberName(null, name, f.createTypeName(null, buffer.toString())));
}
- final String id = trim(variable.getAttributeAsString(CF.STANDARD_NAME));
+ final String id = variable.getAttributeAsString(CF.STANDARD_NAME);
if (id != null && !id.equals(name)) {
addBandName(variable.getAttributeAsString(ACDD.standard_name_vocabulary), id);
}