sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
Date Wed, 13 Mar 2019 15:01:47 GMT
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 d416de4d1c985ac602718a7ade51104fbd0ec47c
Merge: b818b0e c70d212
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Mar 13 15:48:02 2019 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1

 NOTICE                                             |   2 +-
 .../sis-openoffice/src/main/unopkg/license.txt     |   2 +-
 .../org/apache/sis/internal/doclet/Rewriter.java   |   5 +-
 .../org/apache/sis/feature/NamedFeatureType.java   |   3 +-
 .../internal/metadata/LegacyPropertyAdapter.java   |   4 +-
 .../sis/internal/metadata/ReferencingServices.java |  16 +-
 .../apache/sis/internal/simple/SimpleCitation.java |   3 +-
 .../apache/sis/internal/simple/SimpleFormat.java   |   3 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |   3 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |   4 +-
 .../sis/metadata/iso/extent/DefaultExtent.java     |   4 +-
 .../iso/extent/DefaultGeographicBoundingBox.java   |   2 +-
 .../metadata/iso/identification/OperationName.java |   3 +-
 .../sis/metadata/iso/quality/AbstractElement.java  |   2 +-
 .../apache/sis/util/iso/DefaultRecordSchema.java   |   3 +-
 .../main/java/org/apache/sis/util/iso/Types.java   |   2 +-
 .../src/main/java/org/apache/sis/xml/Pooled.java   |   3 +-
 .../apache/sis/coverage/grid/GridDerivation.java   |  35 +-
 .../org/apache/sis/coverage/grid/GridExtent.java   |  11 +-
 .../org/apache/sis/coverage/grid/GridGeometry.java |   1 +
 .../apache/sis/internal/raster/RasterFactory.java  |   2 +-
 .../sis/coverage/grid/GridDerivationTest.java      |  84 +++-
 .../org/apache/sis/image/DefaultIteratorTest.java  |   2 +-
 .../java/org/apache/sis/image/TiledImageMock.java  |   2 +-
 .../org/apache/sis/geometry/EnvelopeReducer.java   |  18 +-
 .../java/org/apache/sis/geometry/Envelopes.java    |  12 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |   4 +-
 .../java/org/apache/sis/geometry/Shapes2D.java     |   2 +-
 .../sis/internal/referencing/ExtentSelector.java   |   2 +-
 .../referencing/GeodeticObjectBuilder.java         |  34 ++
 .../internal/referencing/ReferencingUtilities.java | 215 +++++++++
 .../apache/sis/internal/referencing/Resources.java |  10 +
 .../sis/internal/referencing/Resources.properties  |   2 +
 .../internal/referencing/Resources_fr.properties   |   2 +
 .../internal/referencing/ServicesForMetadata.java  |  98 ++--
 .../referencing/provider/MapProjection.java        |   2 +-
 .../sis/internal/referencing/provider/NTv2.java    |   2 +-
 .../org/apache/sis/parameter/TensorParameters.java |  11 +-
 .../sis/parameter/UninitializedParameter.java      |   3 +-
 .../sis/referencing/crs/DefaultTemporalCRS.java    | 120 +++--
 .../factory/sql/InstallationScriptProvider.java    |   4 +-
 .../apache/sis/referencing/operation/CRSPair.java  |   3 +-
 .../operation/CoordinateOperationContext.java      |  38 +-
 .../operation/CoordinateOperationSorter.java       |   2 +-
 .../operation/builder/LinearTransformBuilder.java  | 514 +++++++++++++++++----
 .../operation/builder/LocalizationGridBuilder.java | 366 ++++++++++++---
 .../operation/builder/ProjectedTransformTry.java   | 359 ++++++++++++++
 .../operation/builder/TransformBuilder.java        |   6 +
 .../sis/referencing/operation/matrix/Solver.java   |   2 +-
 .../operation/transform/AbstractMathTransform.java |   2 +-
 .../transform/AbstractMathTransform2D.java         |  24 +-
 .../operation/transform/InterpolatedTransform.java |  26 +-
 .../operation/transform/PassThroughTransform.java  |   2 +-
 .../operation/transform/TransformSeparator.java    |   8 +-
 .../referencing/ReferencingUtilitiesTest.java      | 113 ++++-
 .../referencing/ServicesForMetadataTest.java       |   6 +-
 .../referencing/crs/DefaultTemporalCRSTest.java    |  55 ++-
 .../factory/sql/epsg/DataScriptFormatter.java      |   2 +-
 .../sis/referencing/factory/sql/epsg/package.html  |   2 +-
 .../builder/LinearTransformBuilderTest.java        |  37 +-
 .../operation/builder/NonLinearTransform.java      |  51 ++
 .../projection/MapProjectionTestCase.java          |   2 +-
 .../sis/internal/util/StandardDateFormat.java      |   9 +-
 .../java/org/apache/sis/internal/util/Strings.java |  38 +-
 .../main/java/org/apache/sis/math/ArrayVector.java |  16 +-
 .../org/apache/sis/math/ConcatenatedVector.java    |  13 +-
 .../main/java/org/apache/sis/math/Fraction.java    |   7 +-
 .../org/apache/sis/math/LinearlyDerivedVector.java | 331 +++++++++++++
 .../src/main/java/org/apache/sis/math/Plane.java   |   4 +
 .../java/org/apache/sis/math/SequenceVector.java   |  22 +-
 .../src/main/java/org/apache/sis/math/Vector.java  | 120 +++--
 .../java/org/apache/sis/measure/AbstractUnit.java  |   3 +
 .../java/org/apache/sis/measure/UnitFormat.java    |   3 +
 .../src/main/java/org/apache/sis/setup/About.java  |  12 +-
 .../apache/sis/setup/InstallationResources.java    |   4 +-
 .../java/org/apache/sis/util/ArgumentChecks.java   |  88 +++-
 .../main/java/org/apache/sis/util/ArraysExt.java   |  90 +++-
 .../src/main/java/org/apache/sis/util/Version.java |   5 +-
 .../sis/util/collection/DefaultTreeTable.java      |   5 +-
 .../sis/util/collection/TreeTableFormat.java       |   4 +-
 .../java/org/apache/sis/util/logging/Logging.java  |  23 +-
 .../apache/sis/util/logging/MonolineFormatter.java |  19 +-
 .../java/org/apache/sis/util/resources/Errors.java |  43 +-
 .../apache/sis/util/resources/Errors.properties    |  19 +-
 .../apache/sis/util/resources/Errors_fr.properties |  25 +-
 .../org/apache/sis/util/resources/Vocabulary.java  |  20 +
 .../sis/util/resources/Vocabulary.properties       |   4 +
 .../sis/util/resources/Vocabulary_fr.properties    |   4 +
 .../org/apache/sis/internal/util/CitationMock.java |   2 +-
 .../apache/sis/math/LinearlyDerivedVectorTest.java |  82 ++++
 .../apache/sis/test/suite/UtilityTestSuite.java    |   1 +
 .../org/apache/sis/util/ArgumentChecksTest.java    |  16 +-
 .../java/org/apache/sis/util/ArraysExtTest.java    |  13 +
 .../sis/util/logging/MonolineFormatterTest.java    |   5 +-
 ide-project/NetBeans/nbproject/genfiles.properties |   2 +-
 ide-project/NetBeans/nbproject/project.xml         |   3 +
 pom.xml                                            |  26 +-
 .../org/apache/sis/storage/gdal/Proj4Parser.java   |   2 +-
 .../java/org/apache/sis/internal/netcdf/Axis.java  |  71 ++-
 .../org/apache/sis/internal/netcdf/CRSBuilder.java |   2 +-
 .../apache/sis/internal/netcdf/NamedElement.java   |  13 +-
 .../org/apache/sis/internal/netcdf/Resources.java  |   5 +
 .../sis/internal/netcdf/Resources.properties       |   1 +
 .../sis/internal/netcdf/Resources_fr.properties    |   1 +
 .../org/apache/sis/internal/netcdf/Variable.java   |  19 +-
 .../org/apache/sis/internal/netcdf/ucar/Utils.java |   3 +-
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |  11 +
 .../apache/sis/storage/netcdf/AttributeNames.java  |   3 +-
 .../sis/internal/storage/AbstractGridResource.java |   2 +-
 109 files changed, 3028 insertions(+), 548 deletions(-)

diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 3f06e92,2859e14..2a2e855
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=f8afd8eb
 -nbproject/build-impl.xml.data.CRC32=f55f037a
 -nbproject/build-impl.xml.script.CRC32=a7689f96
++nbproject/build-impl.xml.data.CRC32=1e0174fb
 +nbproject/build-impl.xml.script.CRC32=aa8f5386
  nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48


Mime
View raw message