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 2022/12/02 14:07:50 UTC
[sis] 02/03: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 92a8dad1310fe4f537e375b09ec60850ad7a79c5
Merge: 0d88ef7e00 6053448501
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Dec 2 14:36:12 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
application/sis-console/pom.xml | 23 ---
application/sis-console/src/main/artifact/LICENSE | 1 -
application/sis-console/src/main/artifact/NOTICE | 1 -
application/sis-console/src/main/artifact/README | 98 -------------
.../src/main/artifact/conf/logging.properties | 63 --------
.../sis-console/src/main/artifact/data/README | 10 --
.../sis-console/src/main/artifact/lib/README | 8 --
.../sis-console/src/main/artifact/log/README | 1 -
application/sis-javafx/src/main/artifact/README | 4 +-
.../src/main/artifact/bin/sis | 4 +-
.../src/main/artifact/bin/{sisfx.bat => sis.bat} | 21 +--
application/sis-javafx/src/main/artifact/bin/sisfx | 2 +-
.../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +-
.../src/main/artifact/conf/logging.properties | 7 +-
.../sis-javafx/src/main/artifact/data/README | 11 +-
.../sis-javafx/src/main/artifact/log/README | 2 +-
.../org/apache/sis/internal/setup/FXFinder.java | 29 ++--
.../sis/internal/setup/LoggingConfiguration.java | 94 ------------
.../apache/sis/internal/setup/package-info.java | 2 +-
application/sis-openoffice/pom.xml | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 6 +-
cloud/sis-cloud-aws/pom.xml | 2 +-
core/sis-build-helper/pom.xml | 7 +-
.../org/apache/sis/internal/maven/Assembler.java | 8 +-
core/sis-cql/pom.xml | 4 +-
.../java/org/apache/sis/image/BandedIterator.java | 12 +-
.../java/org/apache/sis/image/PixelIterator.java | 8 +-
.../apache/sis/image/WritablePixelIterator.java | 6 +-
.../apache/sis/internal/jaxb/gco/GO_DateTime.java | 7 +-
.../gco/{GO_DateTime.java => GO_Temporal.java} | 61 ++++----
.../internal/metadata/legacy/DateToTemporal.java | 87 +++++++++++
.../internal/metadata/legacy/TemporalToDate.java | 94 ++++++++++++
.../org/apache/sis/internal/xml/XmlUtilities.java | 143 +++++++++++++++++-
.../org/apache/sis/internal/xml/package-info.java | 2 +-
.../sis/metadata/iso/quality/AbstractElement.java | 27 ++--
.../sis/metadata/iso/quality/AbstractResult.java | 28 ++--
.../iso/quality/DefaultEvaluationMethod.java | 78 +++++-----
.../iso/quality/DefaultSampleBasedInspection.java | 8 +-
.../sis/metadata/iso/quality/package-info.java | 1 +
.../iso/spatial/AbstractSpatialRepresentation.java | 3 +
.../apache/sis/internal/xml/XmlUtilitiesTest.java | 67 ++++++++-
.../metadata/iso/quality/AbstractElementTest.java | 96 +++----------
...tTest.java => DefaultEvaluationMethodTest.java} | 24 ++--
.../apache/sis/test/suite/MetadataTestSuite.java | 1 +
.../apache/sis/internal/referencing/Resources.java | 6 +
.../sis/internal/referencing/Resources.properties | 1 +
.../internal/referencing/Resources_fr.properties | 1 +
.../main/java/org/apache/sis/referencing/CRS.java | 20 ++-
.../java/org/apache/sis/referencing/CommonCRS.java | 160 ++++++++++-----------
.../sis/referencing/EPSGFactoryFallback.java | 41 +++---
.../apache/sis/referencing/IdentifiedObjects.java | 14 +-
.../sis/referencing/StandardDefinitions.java | 100 +++++++++----
.../org/apache/sis/referencing/package-info.java | 2 +-
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../apache/sis/internal/system/package-info.java | 2 +-
.../org/apache/sis/util/logging/Initializer.java | 133 +++++++++++++++++
pom.xml | 2 +-
57 files changed, 941 insertions(+), 708 deletions(-)
diff --cc application/sis-javafx/src/main/artifact/bin/sis
index d0560d9f74,f91aaab288..3bd0f8e21f
--- a/application/sis-javafx/src/main/artifact/bin/sis
+++ b/application/sis-javafx/src/main/artifact/bin/sis
@@@ -24,7 -23,8 +23,8 @@@ SIS_DATA="${SIS_DATA:-$BASE_DIR/data}
export SIS_DATA
# Execute SIS with any optional JAR that the user may put in the 'lib' directory.
-java -classpath "$BASE_DIR/lib/sis-console-2.0-SNAPSHOT.jar" \
+java -classpath "$BASE_DIR/lib/sis-console-1.x-SNAPSHOT.jar" \
+ -Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
org.apache.sis.console.Command $SIS_OPTS "$@"
diff --cc application/sis-javafx/src/main/artifact/bin/sis.bat
index aa85ebac1b,a71f977170..6d5ddfcda6
--- a/application/sis-javafx/src/main/artifact/bin/sis.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sis.bat
@@@ -17,20 -17,11 +17,11 @@@ REM limitations under the License
SET BASE_DIR=%~dp0\..
- CALL "%BASE_DIR%\conf\setenv.bat"
SET SIS_DATA=%BASE_DIR%\data
- IF "%PATH_TO_FX%"=="" (
- java --class-path "%BASE_DIR%\lib\*" org.apache.sis.internal.setup.FXFinder "%BASE_DIR%\conf\setenv.bat"
- IF %ERRORLEVEL% GEQ 1 EXIT /B 1
- CALL "%BASE_DIR%\conf\setenv.bat"
- )
-
- java -splash:"%BASE_DIR%\lib\logo.jpg"^
- --add-modules javafx.graphics,javafx.controls,javafx.web^
- --module-path "%PATH_TO_FX%"^
- --class-path "%BASE_DIR%\lib\sis-javafx-1.x-SNAPSHOT.jar"^
- -Djava.util.logging.config.class=org.apache.sis.internal.setup.LoggingConfiguration^
- -Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
- -Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
- org.apache.sis.gui.DataViewer %SIS_OPTS%
+ REM Execute SIS with any optional JAR that the user may put in the 'lib' directory.
-java -classpath "%BASE_DIR%\lib\sis-console-2.0-SNAPSHOT.jar"^
++java -classpath "%BASE_DIR%\lib\sis-console-1.x-SNAPSHOT.jar"^
+ -Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
+ -Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
+ -Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
+ org.apache.sis.console.Command %SIS_OPTS% %*
diff --cc application/sis-javafx/src/main/artifact/bin/sisfx
index 90b93e9b8f,a24781167d..c6d8e55b2d
--- a/application/sis-javafx/src/main/artifact/bin/sisfx
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx
@@@ -38,8 -38,8 +38,8 @@@ f
java -splash:"$BASE_DIR/lib/logo.jpg" \
--add-modules javafx.graphics,javafx.controls,javafx.web \
--module-path "$PATH_TO_FX" \
- --class-path "$BASE_DIR/lib/sis-javafx-2.0-SNAPSHOT.jar" \
+ --class-path "$BASE_DIR/lib/sis-javafx-1.x-SNAPSHOT.jar" \
- -Djava.util.logging.config.class="org.apache.sis.internal.setup.LoggingConfiguration" \
+ -Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
org.apache.sis.gui.DataViewer $SIS_OPTS "$@"
diff --cc application/sis-javafx/src/main/artifact/bin/sisfx.bat
index aa85ebac1b,08887fe358..1981212bc8
--- a/application/sis-javafx/src/main/artifact/bin/sisfx.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx.bat
@@@ -29,8 -29,8 +29,8 @@@ IF "%PATH_TO_FX%"==""
java -splash:"%BASE_DIR%\lib\logo.jpg"^
--add-modules javafx.graphics,javafx.controls,javafx.web^
--module-path "%PATH_TO_FX%"^
- --class-path "%BASE_DIR%\lib\sis-javafx-2.0-SNAPSHOT.jar"^
+ --class-path "%BASE_DIR%\lib\sis-javafx-1.x-SNAPSHOT.jar"^
- -Djava.util.logging.config.class=org.apache.sis.internal.setup.LoggingConfiguration^
+ -Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
org.apache.sis.gui.DataViewer %SIS_OPTS%
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
index e85ed225a7,10817f94ec..aaea075dd9
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
@@@ -87,6 -105,32 +105,32 @@@ final class StandardDefinitions
*/
static final String GREENWICH = "8901";
+ /**
+ * Notice about the provenance of those data.
+ * This is provided as a small clarification because EPSG data should be licensed under EPSG Terms of Use.
+ * The approach in this class is to use only the data that are available from public sources,
+ * and to add only the EPSG codes as citation references. The notice text is:
+ *
+ * <blockquote>Definitions from public sources. When a definition corresponds to an EPSG object (ignoring metadata),
+ * the EPSG code is provided as a reference where to find the complete definition.</blockquote>
+ */
+ private static final InternationalString NOTICE =
+ Resources.formatInternational(Resources.Keys.FallbackAuthorityNotice);
+
+ /**
+ * The authority for this subset of EPSG database.
+ */
+ static final Citation AUTHORITY;
+ static {
+ final DefaultCitation c = new DefaultCitation();
+ c.setTitle(Vocabulary.formatInternational(Vocabulary.Keys.SubsetOf_1, Constants.EPSG));
+ c.setEdition(new SimpleInternationalString(StandardDefinitions.VERSION));
+ c.getPresentationForms().add(PresentationForm.DOCUMENT_DIGITAL);
- c.getOtherCitationDetails().add(NOTICE);
++ c.setOtherCitationDetails(NOTICE);
+ c.transitionTo(DefaultCitation.State.FINAL);
+ AUTHORITY = c;
+ }
+
/**
* Do not allow instantiation of this class.
*/