Cf anyPoint writer rework to use multiple altNames and timeNames

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

@@ -38,9 +38,9 @@ protected DsgCollectionImpl(String name, CalendarDateUnit timeUnit, String altUn
   protected DsgCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
       String altUnits) {
     this.name = name;
-    // this.timeName = timeName;
+    this.timeName = timeName;
     this.timeUnit = timeUnit;
-    // this.altName = altName;
+    this.altName = altName;
     this.altUnits = altUnits;
   }
 

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

@@ -25,6 +25,12 @@ protected PointFeatureCCCImpl(String name, CalendarDateUnit timeUnit, String alt
     this.collectionFeatureType = collectionFeatureType;
   }
 
+  protected PointFeatureCCCImpl(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/ProfileFeatureImpl.java

@@ -31,6 +31,17 @@ public ProfileFeatureImpl(String name, CalendarDateUnit timeUnit, String altUnit
     }
   }
 
+  public ProfileFeatureImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName, String altUnits,
+      double lat, double lon, double time, int nfeatures) {
+    super(name, timeName, timeUnit, altName, altUnits);
+    this.latlonPoint = LatLonPoint.create(lat, lon);
+    this.time = time;
+    if (nfeatures >= 0) {
+      getInfo(); // create the object
+      info.nfeatures = nfeatures;
+    }
+  }
+
   @Override
   @Nonnull
   public LatLonPoint getLatLon() {

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

@@ -21,8 +21,9 @@
 
 public abstract class SectionCollectionImpl extends PointFeatureCCCImpl implements TrajectoryProfileFeatureCollection {
 
-  protected SectionCollectionImpl(String name, CalendarDateUnit timeUnit, String altUnits) {
-    super(name, timeUnit, altUnits, FeatureType.TRAJECTORY_PROFILE);
+  protected SectionCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.TRAJECTORY_PROFILE);
   }
 
   /////////////////////////////////////////////////////////////////////////////////////

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

@@ -23,8 +23,9 @@
 
 public abstract class SectionFeatureImpl extends PointFeatureCCImpl implements TrajectoryProfileFeature {
 
-  protected SectionFeatureImpl(String name, CalendarDateUnit timeUnit, String altUnits) {
-    super(name, timeUnit, altUnits, FeatureType.TRAJECTORY_PROFILE);
+  protected SectionFeatureImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.TRAJECTORY_PROFILE);
   }
 
   /////////////////////////////////////////////////////////////////////////////////////

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

@@ -34,6 +34,11 @@ public StationProfileCollectionImpl(String name, CalendarDateUnit timeUnit, Stri
     super(name, timeUnit, altUnits, FeatureType.STATION_PROFILE);
   }
 
+  public StationProfileCollectionImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName,
+      String altUnits) {
+    super(name, timeName, timeUnit, altName, altUnits, FeatureType.STATION_PROFILE);
+  }
+
   // 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 StationProfileFeatureCollectionSubset extends StationProfil
     private final List<StationFeature> stations;
 
     StationProfileFeatureCollectionSubset(StationProfileCollectionImpl from, List<StationFeature> stations) {
-      super(from.getName(), from.getTimeUnit(), from.getAltUnits());
+      super(from.getName(), from.getTimeName(), from.getTimeUnit(), from.getAltName(), from.getAltUnits());
       this.from = from;
       this.stations = stations;
     }

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

@@ -119,6 +119,24 @@ public int compareTo(@Nonnull Station so) {
     return station.getName().compareTo(so.getName());
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StationProfileFeatureImpl)) {
+      return false;
+    }
+
+    StationProfileFeatureImpl that = (StationProfileFeatureImpl) o;
+    return name.equals(that.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return name.hashCode();
+  }
+
   // @Override
   public StationProfileFeature subset(LatLonRect boundingBox) {
     return this; // only one station - we could check if its in the bb

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

@@ -17,6 +17,15 @@
  */
 public abstract class TrajectoryFeatureImpl extends PointCollectionImpl implements TrajectoryFeature {
 
+  public TrajectoryFeatureImpl(String name, String timeName, CalendarDateUnit timeUnit, String altName, String altUnits,
+      int nfeatures) {
+    super(name, timeName, timeUnit, altName, altUnits);
+    if (nfeatures >= 0) {
+      getInfo(); // create the object
+      info.nfeatures = nfeatures;
+    }
+  }
+
   public TrajectoryFeatureImpl(String name, CalendarDateUnit timeUnit, String altUnits, int nfeatures) {
     super(name, timeUnit, altUnits);
     if (nfeatures >= 0) {

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

@@ -63,8 +63,9 @@ private class StandardProfileFeature extends ProfileFeatureImpl {
     StructureData profileData;
 
     StandardProfileFeature(Cursor cursor, double time, StructureData profileData) {
-      super(ft.getFeatureName(cursor), StandardProfileCollectionImpl.this.getTimeUnit(),
-          StandardProfileCollectionImpl.this.getAltUnits(), ft.getLatitude(cursor), ft.getLongitude(cursor), time, -1);
+      super(ft.getFeatureName(cursor), ft.getTimeName(), StandardProfileCollectionImpl.this.getTimeUnit(),
+          ft.getAltName(), StandardProfileCollectionImpl.this.getAltUnits(), ft.getLatitude(cursor),
+          ft.getLongitude(cursor), time, -1);
 
       this.cursor = cursor;
       this.profileData = profileData;

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

@@ -40,7 +40,7 @@ public class StandardSectionCollectionImpl extends SectionCollectionImpl {
   private NestedTable ft;
 
   StandardSectionCollectionImpl(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();
   }
@@ -122,8 +122,8 @@ private class StandardSectionFeature extends SectionFeatureImpl {
     StructureData sectionData;
 
     StandardSectionFeature(Cursor cursor, StructureData sectionData) {
-      super(ft.getFeatureName(cursor), StandardSectionCollectionImpl.this.getTimeUnit(),
-          StandardSectionCollectionImpl.this.getAltUnits());
+      super(ft.getFeatureName(cursor), ft.getTimeName(), StandardSectionCollectionImpl.this.getTimeUnit(),
+          ft.getAltName(), StandardSectionCollectionImpl.this.getAltUnits());
       this.cursor = cursor;
       this.sectionData = sectionData;
     }
@@ -201,8 +201,8 @@ private class StandardSectionProfileFeature extends ProfileFeatureImpl {
     StructureData profileData;
 
     StandardSectionProfileFeature(Cursor cursor, double time, StructureData profileData) {
-      super(ft.getFeatureName(cursor), StandardSectionCollectionImpl.this.getTimeUnit(),
-          StandardSectionCollectionImpl.this.getAltUnits(), ft.getLatitude(cursor), ft.getLongitude(cursor), time, -1);
+      super(ft.getFeatureName(cursor), ft.getTimeName(), ft.getTimeUnit(), ft.getAltName(), ft.getAltUnits(),
+          ft.getLatitude(cursor), ft.getLongitude(cursor), time, -1);
 
       this.cursor = cursor;
       this.profileData = profileData;

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

@@ -73,8 +73,7 @@ private class StandardStationFeatureImpl extends StationTimeSeriesFeatureImpl {
     StructureData stationData;
 
     StandardStationFeatureImpl(StationFeature s, CalendarDateUnit dateUnit, StructureData stationData, int recnum) {
-      super(s, StandardStationCollectionImpl.this.getTimeName(), dateUnit,
-          StandardStationCollectionImpl.this.getAltName(), StandardStationCollectionImpl.this.getAltUnits(), -1);
+      super(s, ft.getTimeName(), dateUnit, ft.getAltName(), ft.getAltUnits(), -1);
       this.recnum = recnum;
       this.stationData = stationData;
     }

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

@@ -47,7 +47,7 @@ public class StandardStationProfileCollectionImpl extends StationProfileCollecti
   private NestedTable ft;
 
   StandardStationProfileCollectionImpl(NestedTable ft, CalendarDateUnit timeUnit, String altUnits) {
-    super(ft.getName(), timeUnit, altUnits);
+    super(ft.getName(), ft.getTimeName(), timeUnit, ft.getAltName(), altUnits);
     this.ft = ft;
   }
 
@@ -228,8 +228,8 @@ public boolean hasNext() throws IOException {
       @Override
       public PointFeatureCollection next() {
         count++;
-        PointFeatureCollection result = new StandardProfileFeature(station, getTimeUnit(), getAltUnits(),
-            ft.getObsTime(cursor), cursor.copy(), profileData);
+        PointFeatureCollection result = new StandardProfileFeature(station, getTimeName(), getTimeUnit(), getAltName(),
+            getAltUnits(), ft.getObsTime(cursor), cursor.copy(), profileData);
         prev = (DsgCollectionImpl) result;
         return result;
       }
@@ -247,10 +247,10 @@ private class StandardProfileFeature extends ProfileFeatureImpl {
     private Cursor cursor;
     StructureData profileData;
 
-    StandardProfileFeature(Station s, CalendarDateUnit timeUnit, String altUnits, double time, Cursor cursor,
-        StructureData profileData) {
-      super(timeUnit.makeCalendarDate(time).toString(), timeUnit, altUnits, s.getLatitude(), s.getLongitude(), time,
-          -1);
+    StandardProfileFeature(Station s, String timeName, CalendarDateUnit timeUnit, String altName, String altUnits,
+        double time, Cursor cursor, StructureData profileData) {
+      super(timeUnit.makeCalendarDate(time).toString(), timeName, timeUnit, altName, altUnits, s.getLatitude(),
+          s.getLongitude(), time, -1);
       this.cursor = cursor;
       this.profileData = profileData;
 

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

@@ -40,7 +40,7 @@ protected StandardTrajectoryCollectionImpl(String name, CalendarDateUnit timeUni
   }
 
   StandardTrajectoryCollectionImpl(NestedTable ft, CalendarDateUnit timeUnit, String altUnits) {
-    super(ft.getName(), timeUnit, altUnits, FeatureType.TRAJECTORY);
+    super(ft.getName(), ft.getTimeName(), timeUnit, ft.getAltName(), altUnits, FeatureType.TRAJECTORY);
     this.ft = ft;
     this.extras = ft.getExtras();
   }
@@ -57,8 +57,8 @@ private class StandardTrajectoryFeature extends TrajectoryFeatureImpl {
     StructureData trajData;
 
     StandardTrajectoryFeature(Cursor cursor, StructureData trajData) {
-      super(ft.getFeatureName(cursor), StandardTrajectoryCollectionImpl.this.getTimeUnit(),
-          StandardTrajectoryCollectionImpl.this.getAltUnits(), -1);
+      super(ft.getFeatureName(cursor), ft.getTimeName(), StandardTrajectoryCollectionImpl.this.getTimeUnit(),
+          ft.getAltName(), StandardTrajectoryCollectionImpl.this.getAltUnits(), -1);
       this.cursor = cursor;
       this.trajData = trajData;
     }