sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/02: Update examples of ESRI codes.
Date Thu, 19 Nov 2020 13:32:10 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit a1ab9bbcd1398cbe2f6379a31f6705be61ce57e5
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Nov 19 13:24:01 2020 +0100

    Update examples of ESRI codes.
---
 .../java/org/apache/sis/io/wkt/doc-files/ESRI.txt  | 65 +++++++++++++++-------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/doc-files/ESRI.txt b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/doc-files/ESRI.txt
index dacde57..2a981b9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/doc-files/ESRI.txt
+++ b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/doc-files/ESRI.txt
@@ -11,8 +11,8 @@
 # mandatory for definitions in this file.
 #
 # WKT strings can span many lines. All lines after the first
-# line shall be indented with at least one white space.
-# Non-indented lines start new definitions.
+# line or a CRS definition shall be indented with at least
+# one white space. Non-indented lines start new definitions.
 #
 # All lines starting with the # character are comment lines.
 #
@@ -31,39 +31,62 @@
 # other WKT strings by "$<identifier>".
 #
 
+
 #
-# Alias for WGS84 geographic CRS.
-# Can be inserted in projected CRS with "$WGS84".
+# Alias for WGS84 geographic CRS and Cartesian CS.
+# Can be inserted in projected CRS with "$WGS84"
+# and "$CARTESIAN_CS".
 #
 SET WGS84_BASE =
- BaseGeodCRS["GCS_WGS_1984",
-  Datum["D_WGS_1984",
-   Ellipsoid["WGS_1984", 6378137, 298.257223563]],
+ BaseGeodCRS["WGS 1984",
+  Datum["World Geodetic System 1984",
+   Ellipsoid["WGS 1984", 6378137, 298.257223563]],
   AngleUnit["Degree", 0.0174532925199433]]
 
+SET CARTESIAN_CS =
+ CS[Cartesian, 2],
+  Axis["Easting (E)", east],
+  Axis["Northing (N)", north],
+  Unit["metre", 1]
+
+
 #
 # Derived from https://github.com/Esri/projection-engine-db-doc
-# with base CRS replaced by alias and parameter values omitted
-# when they have the default value.
+# with the following modifications:
+#
+#  - Rewrite in WKT 2 format.
+#  - Replace some duplicated elements by aliases.
+#  - Omit parameters having default value.
+#  - Replace ESRI names by EPSG names.
 #
-ProjectedCRS["North_Pole_Stereographic",
+ProjectedCRS["North Pole Azimuthal Equidistant",
+ $WGS84_BASE,
+ Conversion["North Pole Azimuthal Equidistant",
+  Method["Azimuthal Equidistant (Spherical)"],
+  Parameter["Latitude of natural origin", 90]],
+ $CARTESIAN_CS,
+ Id["ESRI", 102016]]
+
+ProjectedCRS["North Pole Stereographic",
  $WGS84_BASE,
- Conversion["Stereographic North Pole",
+ Conversion["North Pole Stereographic",
   Method["Polar Stereographic (variant A)"],
   Parameter["Latitude of natural origin", 90]],
- CS[Cartesian, 2],
-  Axis["Easting (E)", east],
-  Axis["Northing (N)", north],
-  Unit["metre", 1],
+ $CARTESIAN_CS,
  Id["ESRI", 102018]]
 
-ProjectedCRS["South_Pole_Stereographic",
+ProjectedCRS["South Pole Azimuthal Equidistant",
  $WGS84_BASE,
- Conversion["Stereographic South Pole",
+ Conversion["South Pole Azimuthal Equidistant",
+  Method["Azimuthal Equidistant (Spherical)"],
+  Parameter["Latitude of natural origin", -90]],
+ $CARTESIAN_CS,
+ Id["ESRI", 102019]]
+
+ProjectedCRS["South Pole Stereographic",
+ $WGS84_BASE,
+ Conversion["South Pole Stereographic",
   Method["Polar Stereographic (variant A)"],
   Parameter["Latitude of natural origin", -90]],
- CS[Cartesian, 2],
-  Axis["Easting (E)", east],
-  Axis["Northing (N)", north],
-  Unit["metre", 1],
+ $CARTESIAN_CS,
  Id["ESRI", 102021]]


Mime
View raw message