Add ROTATED_LONGITUDE, ROTATED_LATITUDE constants to CF

Unidata · Jun 20, 2023 · 495827a · 495827a
1 parent b4cf97a
commit 495827a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 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
@@ -118,6 +118,8 @@ public class CF {
   public static final String GRID_MAPPING_NAME = "grid_mapping_name";
   public static final String GRID_NORTH_POLE_LATITUDE = "grid_north_pole_latitude"; // rotated grid
   public static final String GRID_NORTH_POLE_LONGITUDE = "grid_north_pole_longitude"; // rotated grid
+  public static final String ROTATED_LATITUDE = "rotated_latitude";
+  public static final String ROTATED_LONGITUDE = "rotated_longitude";
   public static final String INVERSE_FLATTENING = "inverse_flattening";
   public static final String LATITUDE_OF_PROJECTION_ORIGIN = "latitude_of_projection_origin";
   public static final String LONGITUDE_OF_PROJECTION_ORIGIN = "longitude_of_projection_origin";

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
@@ -425,12 +425,12 @@ protected AxisType getAxisType(NetcdfDataset ncDataset, VariableEnhanced v) {
       }
 
       if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_ANG_COORDINATE)
-          || sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase("rotated_longitude")) {
+          || sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase(CF.ROTATED_LONGITUDE)) {
         return AxisType.GeoX;
       }
 
       if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_Y_ANG_COORDINATE)
-          || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase("rotated_latitude")) {
+          || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase(CF.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
@@ -483,12 +483,12 @@ public AxisType getAxisType(VariableDS.Builder vb) {
       }
 
       if (sname.equalsIgnoreCase(CF.PROJECTION_X_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_X_ANG_COORDINATE)
-          || sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase("rotated_longitude")) {
+          || sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase(CF.ROTATED_LONGITUDE)) {
         return AxisType.GeoX;
       }
 
       if (sname.equalsIgnoreCase(CF.PROJECTION_Y_COORDINATE) || sname.equalsIgnoreCase(CF.PROJECTION_Y_ANG_COORDINATE)
-          || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase("rotated_latitude")) {
+          || sname.equalsIgnoreCase(CF.GRID_LATITUDE) || sname.equalsIgnoreCase(CF.ROTATED_LATITUDE)) {
         return AxisType.GeoY;
       }