broken tests :/

Author: Hailey Johnson

cdm/core/src/main/java/ucar/nc2/ft/point/writer/CFPointWriter.java

@@ -9,6 +9,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterDescription;
 import com.beust.jcommander.ParameterException;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
 import org.slf4j.Logger;
@@ -266,26 +267,34 @@ private static int writeStationProfileFeatureCollection(FeatureDatasetPoint data
       List<Variable> extraVariables = new ArrayList<>();
       List<StationFeature> flattenFeatures = new ArrayList<>();
 
+      int countProfiles = 0;
+      int name_strlen = 0;
       for (DsgFeatureCollection dsgFeatures : dataset.getPointFeatureCollectionList()) {
         extraVariables.addAll(dsgFeatures.getExtraVariables());
         flattenFeatures.addAll(((StationProfileFeatureCollection) dsgFeatures).getStationFeatures());
+        for (StationProfileFeature station : (StationProfileFeatureCollection) dsgFeatures) {
+          name_strlen = Math.max(name_strlen, station.getName().length());
+          for (ProfileFeature fp : station) {
+            countProfiles += Iterables.size((station));
+          }
+        }
       }
 
       cfWriter.setExtraVariables(extraVariables);
       cfWriter.setStations(flattenFeatures);
-      cfWriter.setFeatureAuxInfo(0, 0);
+      cfWriter.setFeatureAuxInfo(countProfiles, name_strlen);
       cfWriter.writeHeader(flattenFeatures);
 
       int count = 0;
       for (DsgFeatureCollection featureCollection : dataset.getPointFeatureCollectionList()) {
         cfWriter.resetObsIndex();
-        for (StationFeature station : ((StationProfileFeatureCollection) featureCollection).getStationFeatures()) {
-          StationProfileFeature spf = (StationProfileFeature) station;
+        for (StationProfileFeature station : (StationProfileFeatureCollection) featureCollection) {
           cfWriter.resetProfileIndex();
-          for (ProfileFeature pf : spf) {
+          station.resetIteration();
+          for (ProfileFeature pf : station) {
             if (pf.getTime() == null)
               continue; // assume this means its an "incomplete multidimensional"
-            count += cfWriter.writeProfile(spf, pf);
+            count += cfWriter.writeProfile(station, pf);
             if (debug && count % 100 == 0)
               logger.debug(String.format("%d ", count));
             if (debug && count % 1000 == 0)

cdm/core/src/main/java/ucar/nc2/ft/point/writer/WriterCFStationProfileCollection.java

@@ -6,7 +6,6 @@
 package ucar.nc2.ft.point.writer;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ucar.ma2.*;
@@ -138,15 +137,6 @@ public void writeHeader(List<StationFeature> stations) throws IOException {
     for (StationFeature sf : stnList) {
       writeStationData(sf);
       stationIndexMap.put(sf.getName(), count);
-      // for (ProfileFeature p : (StationProfileFeature) sf) {
-      // int countPoints = 0;
-      // if (p.size() >= 0) {
-      // countPoints += p.size();
-      // } else {
-      // countPoints += Iterables.size(p);
-      // }
-      // writeProfileData(count, p, countPoints);
-      // }
       count++;
     }
   }

cdm/core/src/main/java/ucar/nc2/ft/point/writer2/WriterCFStationProfileCollection.java

@@ -139,10 +139,8 @@ protected void writeHeader(List<StationFeature> stations) throws IOException {
       stationIndexMap.put(sf.getName(), count);
       for (ProfileFeature p : (StationProfileFeature) sf) {
         int countPoints = 0;
-        if (p.size() >= 0) {
-          countPoints += p.size();
-        } else {
-          countPoints += Iterables.size(p);
+        for (PointFeature pf : p) {
+          countPoints++;
         }
         writeProfileData(count, p, countPoints);
       }