From d457e9b33de42518c4fc6a5985c12efbb24c982b Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 10:22:04 +0000 Subject: [PATCH 01/11] i445 1. Rename Polar Stereographic quoted map parameter --- appf.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appf.adoc b/appf.adoc index 04d8842d..b5bc2523 100644 --- a/appf.adoc +++ b/appf.adoc @@ -298,7 +298,7 @@ grid_mapping_name = polar_stereographic ---- __Map parameters:__:: -* **`straight_vertical_longitude_from_pole`** +* **`longitude_of_projection_origin`** * **`latitude_of_projection_origin`** - Either +90. or -90. * Either **`standard_parallel`** (EPSG 9829) or **`scale_factor_at_projection_origin`** (EPSG 9810) * **`false_easting`** - This parameter is optional (default is 0) From bc12753585380c725fee7e74f46d0d0a789b8bef Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 18:00:56 +0000 Subject: [PATCH 02/11] i445 2. Indicate deprecated Polar Stereographic map parameter --- appf.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appf.adoc b/appf.adoc index b5bc2523..00fd5fec 100644 --- a/appf.adoc +++ b/appf.adoc @@ -298,7 +298,7 @@ grid_mapping_name = polar_stereographic ---- __Map parameters:__:: -* **`longitude_of_projection_origin`** +* **`longitude_of_projection_origin`** or **`straight_vertical_longitude_from_pole`** (deprecated) * **`latitude_of_projection_origin`** - Either +90. or -90. * Either **`standard_parallel`** (EPSG 9829) or **`scale_factor_at_projection_origin`** (EPSG 9810) * **`false_easting`** - This parameter is optional (default is 0) From 252f3846a7b4f5141b356254ca01575b4d87c77c Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 18:01:57 +0000 Subject: [PATCH 03/11] i445 3. Remove deprecated parameter from Table F.1 --- appf.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appf.adoc b/appf.adoc index 00fd5fec..c1647785 100644 --- a/appf.adoc +++ b/appf.adoc @@ -599,10 +599,6 @@ Since there is zero scale distortion along a standard parallel it is also referr In the situation where a conical developable surface intersects the reference ellipsoid there are two standard parallels, in which case this attribute can be used as a vector to record both latitude values, with the additional convention that the standard parallel nearest the pole (N or S) is provided first. Domain: **`-90.0 <= standard_parallel <= 90.0`** -| **`straight_vertical_longitude_from_pole`** | N -| The longitude (degrees_east) to be oriented straight up from the North or South Pole. -Domain: **`-180.0 <= straight_vertical_longitude_from_pole < 180.0`** - | **`sweep_angle_axis `** | S | Indicates the axis on which the view sweeps in a hypothetical gimbal view model of the Earth, as used in the geostationary grid mapping. It corresponds to the outer-gimbal axis of the gimbal view model, about whose axis of rotation the gimbal-gimbal axis moves. From b6a7ff038df9e508d7e5149a58479a525646da72 Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 18:02:40 +0000 Subject: [PATCH 04/11] i445 4. Update statement in Appendix F introduction --- appf.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appf.adoc b/appf.adoc index c1647785..1dc32c69 100644 --- a/appf.adoc +++ b/appf.adoc @@ -18,7 +18,7 @@ These are: - `semi_major_axis` - `semi_minor_axis` -We have used the FGDC "Content Standard for Digital Geospatial Metadata" <> as a guide in choosing the values for **`grid_mapping_name`** and the attribute names for the parameters describing map projections. +In general we have used the FGDC "Content Standard for Digital Geospatial Metadata" <> as a guide in choosing the values for **`grid_mapping_name`** and the attribute names for the parameters describing map projections. === Albers Equal Area From a78674742eca6fd623f48769a2ea1824799b012d Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 18:09:39 +0000 Subject: [PATCH 05/11] i445 5. Correct link to PROJ corresponding projection page --- appf.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appf.adoc b/appf.adoc index 1dc32c69..6399c263 100644 --- a/appf.adoc +++ b/appf.adoc @@ -307,7 +307,7 @@ __Map parameters:__:: __Map coordinates:__:: The x (abscissa) and y (ordinate) rectangular coordinates are identified by the **`standard_name`** attribute values **`projection_x_coordinate`** and **`projection_y_coordinate`** respectively. __Notes:__:: Notes on using the **`PROJ`** software package for computing the mapping may be found at -link:$$https://proj.org/operations/projections/ups.html$$[https://proj.org/operations/projections/ups.html] +link:$$https://proj.org/operations/projections/stere.html$$[https://proj.org/operations/projections/stere.html] and link:$$http://geotiff.maptools.org/proj_list/polar_stereographic.html$$[http://geotiff.maptools.org/proj_list/polar_stereographic.html]. From edf3e136dc22068ca93e65aa207d81995d290aac Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Wed, 1 Nov 2023 18:38:32 +0000 Subject: [PATCH 06/11] i445 6. Update conformance doc to cover deprecated map parameters --- conformance.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/conformance.adoc b/conformance.adoc index d158a911..fd058863 100644 --- a/conformance.adoc +++ b/conformance.adoc @@ -322,6 +322,7 @@ The legal values for the **`grid_mapping_name`** attribute are contained in Appe *Recommendations:* * The grid mapping variables should have 0 dimensions. +* Deprecated attributes for the **`grid_mapping_name`** are: **`scale_factor_at_projection_origin`** for **`grid_mapping_name = lambert_cylindrical_equal_area`** only, where **`standard_parallel`** should instead be used; and **`straight_vertical_longitude_from_pole`** for **`grid_mapping_name = polar_stereographic`** only, where **`longitude_of_projection_origin`** should instead be used. [[section-17]] From 79f0351b6334bd45cf95cbc8158149107abc2d41 Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Thu, 2 Nov 2023 14:13:50 +0000 Subject: [PATCH 07/11] Revert "i445 3. Remove deprecated parameter from Table F.1" This reverts commit 252f3846a7b4f5141b356254ca01575b4d87c77c. --- appf.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appf.adoc b/appf.adoc index 6399c263..ff867b4d 100644 --- a/appf.adoc +++ b/appf.adoc @@ -599,6 +599,10 @@ Since there is zero scale distortion along a standard parallel it is also referr In the situation where a conical developable surface intersects the reference ellipsoid there are two standard parallels, in which case this attribute can be used as a vector to record both latitude values, with the additional convention that the standard parallel nearest the pole (N or S) is provided first. Domain: **`-90.0 <= standard_parallel <= 90.0`** +| **`straight_vertical_longitude_from_pole`** | N +| The longitude (degrees_east) to be oriented straight up from the North or South Pole. +Domain: **`-180.0 <= straight_vertical_longitude_from_pole < 180.0`** + | **`sweep_angle_axis `** | S | Indicates the axis on which the view sweeps in a hypothetical gimbal view model of the Earth, as used in the geostationary grid mapping. It corresponds to the outer-gimbal axis of the gimbal view model, about whose axis of rotation the gimbal-gimbal axis moves. From 9117e77431912c4652a9af5f1a918e76830cafa9 Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Thu, 2 Nov 2023 14:40:59 +0000 Subject: [PATCH 08/11] i445 3. [Revised] Update Table F.1 entry --- appf.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appf.adoc b/appf.adoc index ff867b4d..3cf21af6 100644 --- a/appf.adoc +++ b/appf.adoc @@ -600,7 +600,7 @@ In the situation where a conical developable surface intersects the reference el Domain: **`-90.0 <= standard_parallel <= 90.0`** | **`straight_vertical_longitude_from_pole`** | N -| The longitude (degrees_east) to be oriented straight up from the North or South Pole. +| __Deprecated__. Has the same meaning as **`longitude_of_projection_origin`**, which must be used instead. Domain: **`-180.0 <= straight_vertical_longitude_from_pole < 180.0`** | **`sweep_angle_axis `** | S From a6533141846c5a20b9aab9ec0a408a334e8b5a41 Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Thu, 2 Nov 2023 14:46:34 +0000 Subject: [PATCH 09/11] Release checklist: add SLB to 'additional authors' list --- cf-conventions.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/cf-conventions.adoc b/cf-conventions.adoc index fd721256..a6f6a93a 100644 --- a/cf-conventions.adoc +++ b/cf-conventions.adoc @@ -48,6 +48,7 @@ include::toc-extra.adoc[] * Fernando Manzano, Puertos del Estado * Lars Bärring, SMHI * Chris Barker, NOAA +* Sadie Bartholomew, NCAS and University of Reading Many others have contributed to the development of CF through their participation in discussions about proposed changes. From 28879bf51007efe7d44a113d6fc619acf8148ac3 Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Thu, 2 Nov 2023 14:55:54 +0000 Subject: [PATCH 10/11] Release checklist: add Issue to history listing --- history.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/history.adoc b/history.adoc index 7f01816f..d5646af7 100644 --- a/history.adoc +++ b/history.adoc @@ -7,6 +7,7 @@ === Working version (most recent first) +* {issues}445[Issue #445]: Updates concerning the Polar Stereographic Grid Mapping * {issues}458[Issue #458]: Fix broken link to Unidata documentation. * {issues}423[Issue #423]: Always use "strictly monotonic" when describing coordinate variables * {issues}420[Issue #420]: Add List of Figures From 596d40d579e5340814dd5913524c4e4fe2ce26ce Mon Sep 17 00:00:00 2001 From: "Sadie L. Bartholomew" Date: Fri, 3 Nov 2023 11:27:43 +0000 Subject: [PATCH 11/11] Resolve conflicts: remove rogue spaces from Table F.1 entries --- appf.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appf.adoc b/appf.adoc index 3cf21af6..748fda73 100644 --- a/appf.adoc +++ b/appf.adoc @@ -465,7 +465,7 @@ If **`false_northing`** is not provided it is assumed to be 0. The formula to convert from the coordinate value as written in the **`projection_y_coordinate`** (yf) to a value (y0) used in a transformation without **`false_northing`**, i.e. **`false_northing`**= 0, is: y0 = yf -**`false_northing`** -| **`fixed_angle_axis `** | S +| **`fixed_angle_axis`** | S | Indicates the axis on which the view is fixed in a hypothetical gimbal view model of the Earth, as used in the geostationary grid mapping. It corresponds to the inner-gimbal axis of the gimbal view model, whose axis of rotation moves about the outer-gimbal axis. This value can adopt two values, "x" or "y", corresponding with the Earth's E-W or N-S axis, respectively. @@ -603,7 +603,7 @@ Domain: **`-90.0 <= standard_parallel <= 90.0`** | __Deprecated__. Has the same meaning as **`longitude_of_projection_origin`**, which must be used instead. Domain: **`-180.0 <= straight_vertical_longitude_from_pole < 180.0`** -| **`sweep_angle_axis `** | S +| **`sweep_angle_axis`** | S | Indicates the axis on which the view sweeps in a hypothetical gimbal view model of the Earth, as used in the geostationary grid mapping. It corresponds to the outer-gimbal axis of the gimbal view model, about whose axis of rotation the gimbal-gimbal axis moves. This value can adopt two values, "x" or "y", corresponding with the Earth's E-W or N-S axis, respectively.