This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git.
from e13ceef Fix an exception when opening a netCDF file with one-dimensional variables. add 7b8a6a6 chore(Storage): add a test case for column definition ambiguity. new 4cba6e6 Merge remote-tracking branch 'origin/fix/projection_name_clash' into geoapi-4.0 together with correction for the bug demonstrated by the new test. new a83df8e Trivial comment formatting. The 2 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/feature/DefaultFeatureType.java | 12 +-- .../sis/feature/builder/FeatureTypeBuilder.java | 13 ++- .../org/apache/sis/util/iso/DefaultLocalName.java | 8 +- .../org/apache/sis/util/iso/DefaultMemberName.java | 2 +- .../apache/sis/util/iso/DefaultNameFactory.java | 4 +- .../org/apache/sis/util/iso/DefaultScopedName.java | 4 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 4 +- .../java/org/apache/sis/util/iso/TypeNames.java | 2 +- .../org/apache/sis/util/resources/Vocabulary.java | 5 + .../sis/util/resources/Vocabulary.properties | 1 + .../sis/util/resources/Vocabulary_fr.properties | 1 + .../org/apache/sis/storage/sql/SQLStoreTest.java | 4 +- .../java/org/apache/sis/storage/FeatureQuery.java | 113 +++++++++++++++------ .../org/apache/sis/storage/FeatureQueryTest.java | 26 ++++- 14 files changed, 147 insertions(+), 52 deletions(-)