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 2023/04/29 16:29:55 UTC
[sis] branch geoapi-3.1 updated (8f68fc28fa -> 8d1d6522c4)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
from 8f68fc28fa Merge branch 'geoapi-4.0' into geoapi-3.1 This merge contains mostly javadoc formatting.
add 0f4aaa2d4c Move `CoverageCombiner` to public API.
add 8f686ad270 Update for a change in localization data in Java 20: `Locale.CANADA` become more like US. We fix the tests by using `Locale.CANADA_FRENCH`, which keep the "year/month/day" format.
add 59b0f4a2a1 Fix a compilation error which was unnoticed before Java 20.
add e4fc9a54a7 Make `CoverageCombiner` more suitable to public API: - infer `xdim` and `ydim` automatically. - check units of measurement.
add f6509802be `MathTransforms.linear(MathTransform, DirectPosition)` and `tangent(…)` where duplicating functionality. Deprecate the former in favor of the latter.
add 3704683e32 feat(FeatureQuery): add support for computed fields in query
add 511ec7b89f Merge remote-tracking branch 'origin/feat/computed-fields' into geoapi-4.0.
add 94ed08156b Upgrade dependencies.
new 8d1d6522c4 Merge branch 'geoapi-4.0' into 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:
.../{internal => }/coverage/CoverageCombiner.java | 168 +++++++++++----
.../sis/coverage/grid/GridCoverageBuilder.java | 5 +
.../org/apache/sis/coverage/grid/GridExtent.java | 82 +++++++-
.../apache/sis/feature/ExpressionOperation.java | 227 +++++++++++++++++++++
.../org/apache/sis/feature/FeatureOperations.java | 51 ++++-
.../java/org/apache/sis/feature/LinkOperation.java | 2 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 1 +
.../java/org/apache/sis/image/ComputedImage.java | 20 +-
.../java/org/apache/sis/image/ImageCombiner.java | 72 +++----
.../java/org/apache/sis/image/ImageProcessor.java | 8 +-
.../java/org/apache/sis/image/Visualization.java | 2 +-
.../sis/internal/coverage/SampleDimensions.java | 36 ++++
.../sis/internal/coverage/j2d/ImageLayout.java | 62 +++++-
.../sis/internal/feature/FeatureExpression.java | 14 ++
.../apache/sis/coverage/CoverageCombinerTest.java | 70 +++++++
.../apache/sis/coverage/grid/GridExtentTest.java | 22 +-
.../apache/sis/test/suite/FeatureTestSuite.java | 1 +
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 8 +-
.../operation/transform/MathTransforms.java | 209 +++++++++----------
.../operation/transform/UnitConversion.java | 145 +++++++++++++
.../operation/transform/MathTransformsTest.java | 71 +++----
...DefinitionTest.java => UnitConversionTest.java} | 42 ++--
.../sis/test/suite/ReferencingTestSuite.java | 1 +
.../org/apache/sis/measure/RangeFormatTest.java | 4 +-
.../java/org/apache/sis/measure/RangeTest.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 16 +-
.../apache/sis/internal/sql/feature/Column.java | 2 +-
.../internal/storage/WritableResourceSupport.java | 11 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 135 ++++++++++--
.../org/apache/sis/storage/FeatureQueryTest.java | 63 +++++-
32 files changed, 1228 insertions(+), 328 deletions(-)
rename core/sis-feature/src/main/java/org/apache/sis/{internal => }/coverage/CoverageCombiner.java (63%)
create mode 100644 core/sis-feature/src/main/java/org/apache/sis/feature/ExpressionOperation.java
create mode 100644 core/sis-feature/src/test/java/org/apache/sis/coverage/CoverageCombinerTest.java
create mode 100644 core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/UnitConversion.java
copy core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/{DomainDefinitionTest.java => UnitConversionTest.java} (50%)
[sis] 01/01: Merge branch 'geoapi-4.0' into 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 geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 8d1d6522c4a1b8b19488a7089a9866ab004d6b36
Merge: 8f68fc28fa 94ed08156b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Apr 29 14:42:55 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../{internal => }/coverage/CoverageCombiner.java | 168 +++++++++++----
.../sis/coverage/grid/GridCoverageBuilder.java | 5 +
.../org/apache/sis/coverage/grid/GridExtent.java | 82 +++++++-
.../apache/sis/feature/ExpressionOperation.java | 227 +++++++++++++++++++++
.../org/apache/sis/feature/FeatureOperations.java | 51 ++++-
.../java/org/apache/sis/feature/LinkOperation.java | 2 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 1 +
.../java/org/apache/sis/image/ComputedImage.java | 20 +-
.../java/org/apache/sis/image/ImageCombiner.java | 72 +++----
.../java/org/apache/sis/image/ImageProcessor.java | 8 +-
.../java/org/apache/sis/image/Visualization.java | 2 +-
.../sis/internal/coverage/SampleDimensions.java | 36 ++++
.../sis/internal/coverage/j2d/ImageLayout.java | 62 +++++-
.../sis/internal/feature/FeatureExpression.java | 14 ++
.../apache/sis/coverage/CoverageCombinerTest.java | 70 +++++++
.../apache/sis/coverage/grid/GridExtentTest.java | 22 +-
.../apache/sis/test/suite/FeatureTestSuite.java | 1 +
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 8 +-
.../operation/transform/MathTransforms.java | 209 +++++++++----------
.../operation/transform/UnitConversion.java | 145 +++++++++++++
.../operation/transform/MathTransformsTest.java | 71 +++----
.../operation/transform/UnitConversionTest.java | 59 ++++++
.../sis/test/suite/ReferencingTestSuite.java | 1 +
.../org/apache/sis/measure/RangeFormatTest.java | 4 +-
.../java/org/apache/sis/measure/RangeTest.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 16 +-
.../apache/sis/internal/sql/feature/Column.java | 2 +-
.../internal/storage/WritableResourceSupport.java | 11 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 135 ++++++++++--
.../org/apache/sis/storage/FeatureQueryTest.java | 63 +++++-
32 files changed, 1262 insertions(+), 311 deletions(-)
diff --cc pom.xml
index bd6f1f4426,3f9ab52507..4d4f351707
--- a/pom.xml
+++ b/pom.xml
@@@ -546,8 -546,8 +546,8 @@@
<maven.compiler.target>11</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
<sis.non-free.version>1.3</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
- <javafx.version>19</javafx.version> <!-- Used only if "javafx" profile is activated. -->
+ <javafx.version>20.0.1</javafx.version> <!-- Used only if "javafx" profile is activated. -->
- <geoapi.version>4.0-SNAPSHOT</geoapi.version>
+ <geoapi.version>3.1-SNAPSHOT</geoapi.version>
</properties>
<profiles>