Projection angular coordinates

Unidata · Jun 15, 2023 · 31fff11 · 31fff11
1 parent 49cf520
commit 31fff11
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/constants/CF.java b/cdm/core/src/main/java/ucar/nc2/constants/CF.java
@@ -163,6 +163,9 @@ public class CF {
   public static final String PROJECTION_X_COORDINATE = "projection_x_coordinate";
   public static final String PROJECTION_Y_COORDINATE = "projection_y_coordinate";
 
+  public static final String PROJECTION_X_ANG_COORDINATE = "projection_x_angular_coordinate";
+  public static final String PROJECTION_Y_ANG_COORDINATE = "projection_y_angular_coordinate";
+
   // cf_role
   public static final String PROFILE_ID = "profile_id";
   public static final String TIMESERIES_ID = "timeseries_id"; // alias STATION_ID

diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/conv/CF1Convention.java b/cdm/core/src/main/java/ucar/nc2/dataset/conv/CF1Convention.java
@@ -424,13 +424,11 @@ protected AxisType getAxisType(NetcdfDataset ncDataset, VariableEnhanced v) {
         return AxisType.Lon;
       }
 
-      if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LONGITUDE)
-          || sname.equalsIgnoreCase("rotated_longitude")) {
+      if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_ANG_COORDINATE) || sname.equalsIgnoreCase("rotated_longitude")) {
         return AxisType.GeoX;
       }
 
-      if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LATITUDE)
-          || sname.equalsIgnoreCase("rotated_latitude")) {
+      if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_Y_ANG_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase("rotated_latitude")) {
         return AxisType.GeoY;
       }
 

diff --git a/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/CF1Convention.java b/cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/CF1Convention.java
@@ -482,13 +482,11 @@ public AxisType getAxisType(VariableDS.Builder vb) {
         return AxisType.Lon;
       }
 
-      if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LONGITUDE)
-          || sname.equalsIgnoreCase("rotated_longitude")) {
+      if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_ANG_COORDINATE) || sname.equalsIgnoreCase("rotated_longitude")) {
         return AxisType.GeoX;
       }
 
-      if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LATITUDE)
-          || sname.equalsIgnoreCase("rotated_latitude")) {
+      if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_Y_ANG_COORDINATE) || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase("rotated_latitude")) {
         return AxisType.GeoY;
       }