Closed Handle multiple different time and altitude axes for GridAsPoint writer

cdm/core/src/main/java/ucar/nc2/ft/DsgFeatureCollection.java

@@ -35,6 +35,15 @@ public interface DsgFeatureCollection {
   @Nonnull
   ucar.nc2.constants.FeatureType getCollectionFeatureType();
 
+  /**
+   * The name of time unit.
+   *
+   * @return name of time unit string, may not be null
+   */
+  @Nonnull
+  String getTimeName();
+
+
   /**
    * The time unit.
    * 
@@ -43,6 +52,14 @@ public interface DsgFeatureCollection {
   @Nonnull
   CalendarDateUnit getTimeUnit();
 
+  /**
+   * The altitude name string if it exists.
+   *
+   * @return altitude name string, may be null
+   */
+  @Nullable
+  String getAltName();
+
   /**
    * The altitude unit string if it exists.
    * 

cdm/core/src/main/java/ucar/nc2/ft/point/DsgCollectionImpl.java

@@ -22,29 +22,54 @@
 public abstract class DsgCollectionImpl implements DsgFeatureCollection {
 
   protected String name;
+  protected String timeName;
   protected CalendarDateUnit timeUnit;
+  protected String altName;
   protected String altUnits;
   protected CollectionInfo info;
   protected List<Variable> extras; // variables needed to make CF/DSG writing work
 
   protected DsgCollectionImpl(String name, CalendarDateUnit timeUnit, String altUnits) {
     this.name = name;
+    this.timeName = "time";
+    this.altName = "altitude";
     this.timeUnit = timeUnit;
     this.altUnits = altUnits;
   }
 
+  protected DsgCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    this.name = name;
+    this.timeName = timeName;
+    this.timeUnit = timeUnit;
+    this.altName = altName;
+    this.altUnits = altUnits;
+  }
+
   @Nonnull
   @Override
   public String getName() {
     return name;
   }
 
+  @Nonnull
+  @Override
+  public String getTimeName() {
+    return timeName;
+  }
+
   @Nonnull
   @Override
   public CalendarDateUnit getTimeUnit() {
     return timeUnit;
   }
 
+  @Nullable
+  @Override
+  public String getAltName() {
+    return altName;
+  }
+
   @Nullable
   @Override
   public String getAltUnits() {

cdm/core/src/main/java/ucar/nc2/ft/point/PointCollectionImpl.java

@@ -28,6 +28,11 @@ protected PointCollectionImpl(String name, CalendarDateUnit timeUnit, String alt
     super(name, timeUnit, altUnits);
   }
 
+  protected PointCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits);
+  }
+
   @Nonnull
   @Override
   public FeatureType getCollectionFeatureType() {
@@ -56,7 +61,7 @@ protected static class PointCollectionSubset extends PointCollectionImpl {
     protected CalendarDateRange filter_date;
 
     public PointCollectionSubset(PointCollectionImpl from, LatLonRect filter_bb, CalendarDateRange filter_date) {
-      super(from.name, from.getTimeUnit(), from.getAltUnits());
+      super(from.name, from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits());
       this.from = from;
       this.filter_bb = filter_bb;
       this.filter_date = filter_date;

cdm/core/src/main/java/ucar/nc2/ft/point/PointFeatureCCImpl.java

@@ -29,6 +29,12 @@ protected PointFeatureCCImpl(String name, CalendarDateUnit timeUnit, String altU
     this.collectionFeatureType = collectionFeatureType;
   }
 
+  protected PointFeatureCCImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName, String altUnits,
+      FeatureType collectionFeatureType) {
+    super(name, timeName, timeUnit, altName, altUnits);
+    this.collectionFeatureType = collectionFeatureType;
+  }
+
   // All features in this collection have this feature type
   @Nonnull
   @Override

cdm/core/src/main/java/ucar/nc2/ft/point/StationProfileFeatureImpl.java

@@ -43,6 +43,20 @@ public StationProfileFeatureImpl(String name, String desc, String wmoId, double
     this.timeSeriesNpts = npts;
   }
 
+  public StationProfileFeatureImpl(String name, String desc, String wmoId, double lat, double lon, double alt,
+      String timeName, CalendarDateUnit timeUnit, String altName, String altUnits, int npts) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.STATION_PROFILE);
+    station = new StationImpl(name, desc, wmoId, lat, lon, alt, npts);
+    this.timeSeriesNpts = npts;
+  }
+
+  public StationProfileFeatureImpl(Station s, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits, int npts) {
+    super(s.getName(), timeName, timeUnit, altName, altUnits, FeatureType.STATION_PROFILE);
+    this.station = s;
+    this.timeSeriesNpts = npts;
+  }
+
   public StationProfileFeatureImpl(Station s, CalendarDateUnit timeUnit, String altUnits, int npts) {
     super(s.getName(), timeUnit, altUnits, FeatureType.STATION_PROFILE);
     this.station = s;
@@ -120,7 +134,7 @@ public static class StationProfileFeatureSubset extends StationProfileFeatureImp
     private final CalendarDateRange dateRange;
 
     public StationProfileFeatureSubset(StationProfileFeatureImpl from, CalendarDateRange filter_date) {
-      super(from.station, from.getTimeUnit(), from.getAltUnits(), -1);
+      super(from.station, from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits(), -1);
       this.from = from;
       this.dateRange = filter_date;
     }

cdm/core/src/main/java/ucar/nc2/ft/point/StationTimeSeriesCollectionFlattened.java

@@ -19,7 +19,7 @@ public class StationTimeSeriesCollectionFlattened extends PointCollectionImpl {
   protected StationTimeSeriesCollectionImpl from;
 
   public StationTimeSeriesCollectionFlattened(StationTimeSeriesCollectionImpl from, CalendarDateRange dateRange) {
-    super(from.getName(), from.getTimeUnit(), from.getAltUnits());
+    super(from.getName(), from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits());
     this.from = from;
     if (dateRange != null) {
       getInfo();

cdm/core/src/main/java/ucar/nc2/ft/point/StationTimeSeriesCollectionImpl.java

@@ -35,6 +35,11 @@ public StationTimeSeriesCollectionImpl(String name, CalendarDateUnit timeUnit, S
     super(name, timeUnit, altUnits, FeatureType.STATION);
   }
 
+  public StationTimeSeriesCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.STATION);
+  }
+
   // Double-check idiom for lazy initialization of instance fields. See Effective Java 2nd Ed, p. 283.
   protected StationHelper getStationHelper() {
     if (stationHelper == null) {
@@ -130,7 +135,7 @@ private static class StationSubset extends StationTimeSeriesCollectionImpl {
     private final List<StationFeature> stations;
 
     StationSubset(StationTimeSeriesCollectionImpl from, List<StationFeature> stations) {
-      super(from.getName(), from.getTimeUnit(), from.getAltUnits());
+      super(from.getName(), from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits());
       this.stations = stations;
     }
 

cdm/core/src/main/java/ucar/nc2/ft/point/StationTimeSeriesFeatureImpl.java

@@ -31,6 +31,12 @@ public StationTimeSeriesFeatureImpl(String name, String desc, String wmoId, doub
     s = new StationFeatureImpl(name, desc, wmoId, lat, lon, alt, npts, sdata);
   }
 
+  public StationTimeSeriesFeatureImpl(String name, String desc, String wmoId, double lat, double lon, double alt,
+      String timeName, CalendarDateUnit timeUnit, String altName, String altUnits, int npts, StructureData sdata) {
+    super(name, timeName, timeUnit, altName, altUnits);
+    s = new StationFeatureImpl(name, desc, wmoId, lat, lon, alt, npts, sdata);
+  }
+
   public StationTimeSeriesFeatureImpl(StationFeature s, CalendarDateUnit timeUnit, String altUnits, int nfeatures) {
     super(s.getName(), timeUnit, altUnits);
     this.s = s;
@@ -40,6 +46,16 @@ public StationTimeSeriesFeatureImpl(StationFeature s, CalendarDateUnit timeUnit,
     }
   }
 
+  public StationTimeSeriesFeatureImpl(StationFeature s, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits, int nfeatures) {
+    super(s.getName(), timeName, timeUnit, altName, altUnits);
+    this.s = s;
+    if (nfeatures >= 0) {
+      getInfo(); // create the object
+      info.nfeatures = nfeatures;
+    }
+  }
+
   @Override
   public String getWmoId() {
     return s.getWmoId();

cdm/core/src/main/java/ucar/nc2/ft/point/remote/StationCollectionStream.java

@@ -161,7 +161,8 @@ private class StationFeatureStream extends StationTimeSeriesFeatureImpl {
     PointIteratorStream riter;
 
     StationFeatureStream(StationTimeSeriesFeature s, CalendarDateRange dateRange) {
-      super(s, StationCollectionStream.this.getTimeUnit(), StationCollectionStream.this.getAltUnits(), -1);
+      super(s, s.getTimeName(), StationCollectionStream.this.getTimeUnit(), s.getAltName(),
+          StationCollectionStream.this.getAltUnits(), -1);
       this.stnFeature = s;
       if (dateRange != null) {
         getInfo();

cdm/core/src/main/java/ucar/nc2/ft/point/standard/NestedTable.java

@@ -467,6 +467,14 @@ public boolean hasCoords() {
     return (timeVE != null) && (latVE != null) && (lonVE != null);
   }
 
+  public String getTimeName() {
+    try {
+      return timeVE.axisName;
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error on time name string = " + timeVE.axisName + " == " + e.getMessage());
+    }
+  }
+
   public CalendarDateUnit getTimeUnit() {
     try {
       return CalendarDateUnit.of(null, timeVE.getUnitsString()); // LOOK dont know the calendar
@@ -475,6 +483,14 @@ public CalendarDateUnit getTimeUnit() {
     }
   }
 
+  public String getAltName() {
+    if (altVE != null)
+      return altVE.axisName;
+    if (stnAltVE != null)
+      return stnAltVE.axisName;
+    return null;
+  }
+
   public String getAltUnits() {
     if (altVE != null)
       return altVE.getUnitsString(); // fishy

cdm/core/src/main/java/ucar/nc2/ft/point/standard/StandardPointCollectionImpl.java

@@ -20,7 +20,7 @@ public class StandardPointCollectionImpl extends PointCollectionImpl {
   private NestedTable ft;
 
   StandardPointCollectionImpl(NestedTable ft, CalendarDateUnit timeUnit, String altUnits) {
-    super(ft.getName(), timeUnit, altUnits);
+    super(ft.getName(), ft.getTimeName(), timeUnit, ft.getAltName(), altUnits);
     this.ft = ft;
     this.extras = ft.getExtras();
   }

cdm/core/src/main/java/ucar/nc2/ft/point/standard/StandardProfileCollectionImpl.java

@@ -37,12 +37,13 @@
 public class StandardProfileCollectionImpl extends PointFeatureCCImpl implements ProfileFeatureCollection {
   private NestedTable ft;
 
-  protected StandardProfileCollectionImpl(String name, CalendarDateUnit timeUnit, String altUnits) {
-    super(name, timeUnit, altUnits, FeatureType.PROFILE);
+  protected StandardProfileCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.PROFILE);
   }
 
   StandardProfileCollectionImpl(NestedTable ft, CalendarDateUnit timeUnit, String altUnits) {
-    super(ft.getName(), timeUnit, altUnits, FeatureType.PROFILE);
+    super(ft.getName(), ft.getTimeName(), timeUnit, ft.getAltName(), altUnits, FeatureType.PROFILE);
     this.ft = ft;
     this.extras = ft.getExtras();
   }
@@ -133,7 +134,7 @@ private static class StandardProfileCollectionSubset extends StandardProfileColl
     LatLonRect boundingBox;
 
     StandardProfileCollectionSubset(StandardProfileCollectionImpl from, LatLonRect boundingBox) {
-      super(from.getName() + "-subset", from.getTimeUnit(), from.getAltUnits());
+      super(from.getName() + "-subset", from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits());
       this.from = from;
       this.boundingBox = boundingBox;
     }

cdm/core/src/main/java/ucar/nc2/ft/point/standard/StandardStationCollectionImpl.java

@@ -32,7 +32,7 @@ public class StandardStationCollectionImpl extends StationTimeSeriesCollectionIm
   private NestedTable ft;
 
   StandardStationCollectionImpl(NestedTable ft, CalendarDateUnit timeUnit, String altUnits) {
-    super(ft.getName(), timeUnit, altUnits);
+    super(ft.getName(), ft.getTimeName(), timeUnit, ft.getAltName(), altUnits);
     this.ft = ft;
     this.extras = ft.getExtras();
   }
@@ -73,7 +73,8 @@ private class StandardStationFeatureImpl extends StationTimeSeriesFeatureImpl {
     StructureData stationData;
 
     StandardStationFeatureImpl(StationFeature s, CalendarDateUnit dateUnit, StructureData stationData, int recnum) {
-      super(s, dateUnit, StandardStationCollectionImpl.this.getAltUnits(), -1);
+      super(s, StandardStationCollectionImpl.this.getTimeName(), dateUnit,
+          StandardStationCollectionImpl.this.getAltName(), StandardStationCollectionImpl.this.getAltUnits(), -1);
       this.recnum = recnum;
       this.stationData = stationData;
     }

cdm/core/src/main/java/ucar/nc2/ft/point/standard/StandardStationProfileCollectionImpl.java

@@ -135,7 +135,9 @@ private class StandardStationProfileFeature extends StationProfileFeatureImpl {
     Cursor cursor;
 
     StandardStationProfileFeature(Station s, Cursor cursor, StructureData stationProfileData, int recnum) {
-      super(s, StandardStationProfileCollectionImpl.this.getTimeUnit(),
+      super(s, StandardStationProfileCollectionImpl.this.getTimeName(),
+          StandardStationProfileCollectionImpl.this.getTimeUnit(),
+          StandardStationProfileCollectionImpl.this.getAltName(),
           StandardStationProfileCollectionImpl.this.getAltUnits(), -1);
       this.cursor = cursor;
       // this.recnum = recnum;