This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis-site.git
The following commit(s) were added to refs/heads/main by this push:
new 71c96137 Fix the command-line examples.
71c96137 is described below
commit 71c96137f71b40e27ee0b00ee4cdafc74dd24e32
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Tue Sep 30 19:10:31 2025 +0200
Fix the command-line examples.
---
content/command-line.md | 17 +++++----
.../referencing/CoordinateOperationSteps.html | 2 +-
content/documentation.md | 1 +
content/howto/compound_crs.md | 20 +++++-----
content/howto/lookup_crs_urn.md | 2 +-
content/release-management.md | 43 +++++++++++++---------
static/examples/crs/MissingIdentifier.wkt | 2 +-
7 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/content/command-line.md b/content/command-line.md
index 6e3da24a..e07a4670 100644
--- a/content/command-line.md
+++ b/content/command-line.md
@@ -126,7 +126,7 @@ sis crs EPSG:6676
<details>
<summary>Expected output (click to expand):</summary>
<pre>ProjectedCRS["JGD2011 / Japan Plane Rectangular CS VIII",
- BaseGeodCRS["JGD2011",
+ BaseGeogCRS["JGD2011",
Datum["Japanese Geodetic Datum 2011",
Ellipsoid["GRS 1980", 6378137.0, 298.257222101]],
Unit["degree", 0.017453292519943295]],
@@ -141,10 +141,11 @@ sis crs EPSG:6676
Axis["Northing (X)", north],
Axis["Easting (Y)", east],
Unit["metre", 1],
- Scope["Large and medium scale topographic mapping, cadastral and engineering
survey."],
- Area["Japan - onshore - Honshu between approximately 137°45'E and 139°E -
Niigata-ken; Nagano-ken; Yamanashi-ken; Shizuoka-ken."],
- BBox[34.54, 137.32, 38.58, 139.91],
- Id["EPSG", 6676, "9.9.1", URI["urn:ogc:def:crs:EPSG:9.9.1:6676"]],
+ Usage[
+ Scope["Cadastre, engineering survey, topographic mapping (large and medium
scale)."],
+ Area["Japan - onshore - Honshu between approximately 137°45'E and 139°E -
Niigata-ken; Nagano-ken; Yamanashi-ken; Shizuoka-ken."],
+ BBox[34.54, 137.32, 38.58, 139.91]],
+ Id["EPSG", 6676, "12.026", URI["urn:ogc:def:crs:EPSG:12.026:6676"]],
Remark["Replaces JGD2000 / Japan Plane Rectangular CS VIII (CRS code 2450)
with effect from 21st October 2011."]]</pre>
</details>
<br/>
@@ -206,7 +207,7 @@ sis identifier
https://sis.apache.org/examples/crs/MissingIdentifier.wkt
produces an output like below:
```
-urn:ogc:def:crs:EPSG:9.9.1:27572 | NTF (Paris) / Lambert zone II
+urn:ogc:def:crs:EPSG:12.026:27572 | NTF (Paris) / Lambert zone II
```
As we can see, Apache {{% SIS %}} has been able to find back the identifier
code and the actual {{% CRS %}} name.
@@ -224,7 +225,7 @@ sis identifier
https://sis.apache.org/examples/crs/WrongAxisOrder.wkt
produces an output like below:
```
-! urn:ogc:def:crs:EPSG:8.9:4979 | WGS 84
+! urn:ogc:def:crs:EPSG:12.026:4979 | WGS 84
Legend:
! Identified object matches definition provided by authority except for
coordinate system axes.
@@ -262,7 +263,7 @@ sis identifier
https://sis.apache.org/examples/crs/EquivalentDefinition.wkt
produces an output like below:
```
-urn:ogc:def:crs:EPSG:9.9.1:3994 | WGS 84 / Mercator 41
+urn:ogc:def:crs:EPSG:12.026:3994 | WGS 84 / Mercator 41
```
In above example, Apache {{% SIS %}} used the fact that a
diff --git a/content/developer-guide/referencing/CoordinateOperationSteps.html
b/content/developer-guide/referencing/CoordinateOperationSteps.html
index 479236b8..f2d95031 100644
--- a/content/developer-guide/referencing/CoordinateOperationSteps.html
+++ b/content/developer-guide/referencing/CoordinateOperationSteps.html
@@ -193,7 +193,7 @@
OperationAccuracy[20.0],
Area["Canada - onshore and offshore"],
BBox[40.04, -141.01, 86.46, -47.74],
- Id["EPSG", 1172, "8.9"]]</samp></pre>
+ Id["EPSG", 1172, "12.026"]]</samp></pre>
</div>
</div>
</div>
diff --git a/content/documentation.md b/content/documentation.md
index 460e433e..da6f20f2 100644
--- a/content/documentation.md
+++ b/content/documentation.md
@@ -23,4 +23,5 @@ For library developers:
* [Coding conventions](coding-conventions.html)
* [Release management](release-management.html)
* [Issues tracker](https://issues.apache.org/jira/browse/SIS)
+* [Nightly builds](https://ci-builds.apache.org/job/SIS/)
* [Wiki](https://cwiki.apache.org/confluence/display/SIS)
diff --git a/content/howto/compound_crs.md b/content/howto/compound_crs.md
index 85d1929d..0a97536e 100644
--- a/content/howto/compound_crs.md
+++ b/content/howto/compound_crs.md
@@ -63,28 +63,30 @@ can be invoked instead.
```
CompoundCRS["WGS 84 + MSL height + Julian",
- GeodeticCRS["WGS 84",
- Datum["World Geodetic System 1984",
- Ellipsoid["WGS 84", 6378137.0, 298.257223563]],
+ GeographicCRS["WGS 84",
+ Ensemble["World Geodetic System 1984 ensemble",
+ (... ensemble members omitted for brevity ...)
+ Ellipsoid["WGS 84", 6378137.0, 298.257223563],
+ EnsembleAccuracy[2.0]],
CS[ellipsoidal, 2],
- Axis["Geodetic latitude (Lat)", north],
- Axis["Geodetic longitude (Lon)", east],
+ Axis["Latitude (B)", north],
+ Axis["Longitude (L)", east],
Unit["degree", 0.017453292519943295],
- Id["EPSG", 4326, "9.9.1"]],
+ Id["EPSG", 4326, "12.026"]],
VerticalCRS["MSL height",
VerticalDatum["Mean Sea Level"],
CS[vertical, 1],
Axis["Gravity-related height (H)", up],
Unit["metre", 1],
- Id["EPSG", 5714, "9.9.1"]],
+ Id["EPSG", 5714, "12.026"]],
TimeCRS["Julian",
TimeDatum["Julian", TimeOrigin[-4713-11-24T12:00:00.000]],
CS[temporal, 1],
Axis["Time (t)", future],
TimeUnit["day", 86400],
Id["OGC", "JulianDate"]],
- Area["World."],
- BBox[-90.00, -180.00, 90.00, 180.00]]
+ Usage[
+ BBox[-90.00, -180.00, 90.00, 180.00]]]
Compact alternative is equal: true
```
diff --git a/content/howto/lookup_crs_urn.md b/content/howto/lookup_crs_urn.md
index 9104c9ff..88f1fa79 100644
--- a/content/howto/lookup_crs_urn.md
+++ b/content/howto/lookup_crs_urn.md
@@ -90,6 +90,6 @@ public class LookupAuthorityCode {
```
Identifier declared in the CRS: null
Searching in EPSG database: 27572
-Same, but more generic: urn:ogc:def:crs:EPSG:9.9.1:27572
+Same, but more generic: urn:ogc:def:crs:EPSG:12.026:27572
```
diff --git a/content/release-management.md b/content/release-management.md
index 5a5eaa5d..ceab6a98 100644
--- a/content/release-management.md
+++ b/content/release-management.md
@@ -455,6 +455,10 @@ ln $PATH_TO_FX/*.jar .
cd -
gradle assemble --system-prop org.apache.sis.releaseVersion=$NEW_VERSION
find -name "org.apache.sis.*-javadoc.jar" -exec zip -d '{}' errors.log \;
+
+# Following 3 lines is because we have not yet been able to get the
`--no-fonts` Javadoc option to work with Gradle.
+find -name "org.apache.sis.*-javadoc.jar" -exec zip -d '{}'
resource-files/fonts/* \;
+find -name "org.apache.sis.*-javadoc.jar" -exec zip -d '{}'
legal/dejavufonts.md \;
gradle publishToMavenLocal --system-prop
org.apache.sis.releaseVersion=$NEW_VERSION
# Check that the Javadoc archives do not have a size close to zero.
@@ -476,7 +480,7 @@ Perform the following verifications:
* In the `non-free/sis-epsg-$NEW_VERSION.jar` file, verify that
`META-INF/LICENSE` contains the EPSG terms of use.
Then close this staging repository.
-In the description field, specify _"Apache SIS main artifacts"_.
+In the description field, specify `Apache SIS
$NEW_VERSION-RC$RELEASE_CANDIDATE` (replace by actual values).
Click on the `org.apache.sis-<id>` link in order to get the URL to the
temporary Maven repository created by Nexus.
We will announce later (in the _Put the release candidate up for a vote_
section) on the `dev@` mailing list
the availability of this temporary repository for testing purpose.
@@ -498,12 +502,9 @@ svn commit -m "Test project for SIS
$NEW_VERSION-RC$RELEASE_CANDIDATE"
```
Clear the local Maven repository in order to force downloads from the Nexus
repository, then test.
-This test uses a temporary `SIS_DATA` directory for testing the creation of
the EPSG database.
-The value of the environment variable set below can be replaced by any other
temporary directory.
```bash
-export SIS_DATA=/tmp/Apache_SIS_data
-mkdir $SIS_DATA
+unset SIS_DATA
rm --recursive ~/.m2/repository/org/apache/sis
mvn package --show-version --strict-checksums
```
@@ -539,6 +540,8 @@ Apply the following changes:
* Move all `-classpath` content to `--module-path`.
* Add the value of `$PATH_TO_FX` environment variable to the module-path.
+* Remove the `--no-fonts` option.
+* Add the `-use` and `--since 1.1,1.2,1.3,1.4,1.5` options (edit the list of
releases).
* Delete all Java source files listed after the options, everything until the
end of file.
* Add the following line in-place of deleted lines (omit the
`org.opengis.geoapi` module if not desired):
@@ -549,6 +552,8 @@ org.apache.sis.util,\
org.apache.sis.metadata,\
org.apache.sis.referencing,\
org.apache.sis.referencing.gazetteer,\
+org.apache.sis.referencing.epsg,\
+org.apache.sis.referencing.database,\
org.apache.sis.feature,\
org.apache.sis.storage,\
org.apache.sis.storage.sql,\
@@ -556,6 +561,7 @@ org.apache.sis.storage.xml,\
org.apache.sis.storage.netcdf,\
org.apache.sis.storage.geotiff,\
org.apache.sis.storage.earthobservation,\
+org.apache.sis.storage.gdal,\
org.apache.sis.cloud.aws,\
org.apache.sis.portrayal,\
org.apache.sis.profile.france,\
@@ -571,7 +577,8 @@ Then the Javadoc command is launched manually.
```bash
cd endorsed/src
-ln -s ../../optional/src/org.apache.sis.gui
+ln -s ../../optional/src/org.apache.sis.* .
+rm -r org.apache.sis.test.*
cd -
# Replace "../../GeoAPI/3.0.2" by the path to a GeoAPI 3.0.2 checkout, or omit
those lines.
@@ -616,6 +623,8 @@ Now stage the sources and cleanup:
git archive --prefix apache-sis-$NEW_VERSION-src/ --output
$DIST_DIR/apache-sis-$NEW_VERSION-src.zip $NEW_VERSION-RC
cd $DIST_DIR
zip -d apache-sis-$NEW_VERSION-bin.zip
apache-sis-$NEW_VERSION/lib/org.apache.sis.openoffice.jar
+zip -d apache-sis-$NEW_VERSION-bin.zip
apache-sis-$NEW_VERSION/lib/org.apache.sis.referencing.epsg.jar
+zip -d apache-sis-$NEW_VERSION-bin.zip
apache-sis-$NEW_VERSION/lib/lib/org.apache.sis.referencing.database.jar
```
Sign the source, Javadoc and binary artifacts:
@@ -641,17 +650,17 @@ find . -name "*.asc" -exec gpg --verify '{}' \;
# Integration test {#integration-tests}
-Create a temporary directory where Apache {{% SIS %}} will write the EPSG
dataset.
Force the Java version to the one supported by Apache SIS (adjust `JDK11_HOME`
as needed).
-Specify the URL to the nexus repository, where `####` is the identifier of the
"non-free" repository.
+Specify the URL to the nexus repository, where `####` is the identifier of the
staging repository.
```bash
-export SIS_DATA=/tmp/apache-sis-data
-mkdir $SIS_DATA
+unset SIS_DATA
export JAVA_HOME=$JDK11_HOME
export JDK_JAVA_OPTIONS="-enableassertions -Dorg.apache.sis.epsg.downloadURL"
export
JDK_JAVA_OPTIONS=$JDK_JAVA_OPTIONS=https://repository.apache.org/content/repositories/orgapachesis-####
-export
JDK_JAVA_OPTIONS=$JDK_JAVA_OPTIONS/org/apache/sis/non-free/sis-epsg/$NEW_VERSION/sis-epsg-$NEW_VERSION.jar
+
+# Add the following if debugging is needed
+export JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS
-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:8000"
```
@@ -663,12 +672,12 @@ Unzip the binaries and execute the examples documented in
the [command-line inte
cd /tmp
unzip $DIST_DIR/apache-sis-$NEW_VERSION-bin.zip
cd apache-sis-$NEW_VERSION
-wget https://sis.apache.org/examples/coordinates/AmericanCities.csv
-wget https://sis.apache.org/examples/coordinates/CanadianCities.csv
+wget https://sis.staged.apache.org/examples/coordinates/AmericanCities.csv
+wget https://sis.staged.apache.org/examples/coordinates/CanadianCities.csv
./bin/sis crs EPSG:6676
-./bin/sis identifier https://sis.apache.org/examples/crs/MissingIdentifier.wkt
-./bin/sis identifier https://sis.apache.org/examples/crs/WrongAxisOrder.wkt
-./bin/sis identifier
https://sis.apache.org/examples/crs/EquivalentDefinition.wkt
+./bin/sis identifier
https://sis.staged.apache.org/examples/crs/MissingIdentifier.wkt
+./bin/sis identifier
https://sis.staged.apache.org/examples/crs/WrongAxisOrder.wkt
+./bin/sis identifier
https://sis.staged.apache.org/examples/crs/EquivalentDefinition.wkt
./bin/sis transform --sourceCRS EPSG:4267 --targetCRS EPSG:4326
AmericanCities.csv
./bin/sis transform --sourceCRS EPSG:4267 --targetCRS EPSG:4326
CanadianCities.csv
./bin/sisfx
@@ -745,7 +754,7 @@ find . -name "*.xml" -type f -exec sed -i
's/[[:space:]]*$//' '{}' \;
# Commit
git add --all
-git commit --message "Staging repository for the $NEW_VERSION release."
+git commit --message "Staging web site for the SIS $NEW_VERSION release."
git push
```
diff --git a/static/examples/crs/MissingIdentifier.wkt
b/static/examples/crs/MissingIdentifier.wkt
index a88f3eef..11f54b99 100644
--- a/static/examples/crs/MissingIdentifier.wkt
+++ b/static/examples/crs/MissingIdentifier.wkt
@@ -6,7 +6,7 @@ PROJCRS["NTF (Paris) / zone to be discovered by the demo",
UNIT["grade", 0.015707963267948967]],
CONVERSION["Lambert zone II",
METHOD["Lambert Conic Conformal (1SP)"],
- PARAMETER["Latitude of natural origin", 52.0],
+ PARAMETER["Latitude of natural origin", 52.0, UNIT["grade",
0.015707963267948967]],
PARAMETER["Longitude of natural origin", 0.0],
PARAMETER["Scale factor at natural origin", 0.99987742],
PARAMETER["False easting", 600000.0],
