Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Projection angular coordinates #1202

Merged
merged 5 commits into from
Jun 20, 2023
Merged

Projection angular coordinates #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31fff11
Projection angular coordinates
rschmunk Jun 15, 2023
cc3bb75
:cdm:cdm-core:spotlessApply
rschmunk Jun 15, 2023
e1a90a3
Projection coordinates: Restore deleted check if GRID_LONGITUDE used
rschmunk Jun 15, 2023
6d36bee
Revert fatJars to default
rschmunk Jun 16, 2023
c79b49c
Add ROTATED_LONGITUDE, ROTATED_LATITUDE constants to CF
rschmunk Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cdm/core/src/main/java/ucar/nc2/constants/CF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -163,6 +165,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
Expand Down
8 changes: 4 additions & 4 deletions cdm/core/src/main/java/ucar/nc2/dataset/conv/CF1Convention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,13 +424,13 @@ 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_ANG_COORDINATE)
|| sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase(CF.ROTATED_LONGITUDE)) {
return AxisType.GeoX;
rschmunk marked this conversation as resolved.
Show resolved Hide resolved
}

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(CF.ROTATED_LATITUDE)) {
return AxisType.GeoY;
}

Expand Down
8 changes: 4 additions & 4 deletions cdm/core/src/main/java/ucar/nc2/internal/dataset/conv/CF1Convention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,13 @@ 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_ANG_COORDINATE)
|| sname.equalsIgnoreCase(CF.GRID_LONGITUDE) || sname.equalsIgnoreCase(CF.ROTATED_LONGITUDE)) {
return AxisType.GeoX;
rschmunk marked this conversation as resolved.
Show resolved Hide resolved
}

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(CF.ROTATED_LATITUDE)) {
return AxisType.GeoY;
}

Expand Down