fix CF version and min/max dates

Unidata · Jul 9, 2024 · 2ff52bb · 2ff52bb
1 parent 5d13f44
commit 2ff52bb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/ft/point/writer/CFPointWriter.java b/cdm/core/src/main/java/ucar/nc2/ft/point/writer/CFPointWriter.java
@@ -39,7 +39,6 @@
  * <li>netcdf3: use indexed ragged array representation</li>
  * </ul>
  */
-@Deprecated
 public abstract class CFPointWriter implements Closeable {
   private static final Logger logger = LoggerFactory.getLogger(CFPointWriter.class);
   private static final String CF_VERSION = "CF-1.9";
@@ -861,6 +860,12 @@ public void finish() throws IOException {
       writer.updateAttribute(null, new Attribute(ACDD.LON_MIN, llbb.getLowerLeftPoint().getLongitude()));
       writer.updateAttribute(null, new Attribute(ACDD.LON_MAX, llbb.getUpperRightPoint().getLongitude()));
     }
+    if (minDate == null)
+      minDate = CalendarDate.present();
+    if (maxDate == null)
+      maxDate = CalendarDate.present();
+    writer.updateAttribute(null, new Attribute(ACDD.TIME_START, CalendarDateFormatter.toDateTimeStringISO(minDate)));
+    writer.updateAttribute(null, new Attribute(ACDD.TIME_END, CalendarDateFormatter.toDateTimeStringISO(maxDate)));
 
     writer.close();
   }

diff --git a/cdm/core/src/main/java/ucar/nc2/ft/point/writer/WriterCFPointCollection.java b/cdm/core/src/main/java/ucar/nc2/ft/point/writer/WriterCFPointCollection.java
@@ -37,6 +37,8 @@ public class WriterCFPointCollection extends CFPointWriter {
   public WriterCFPointCollection(String fileOut, List<Attribute> globalAtts, List<VariableSimpleIF> dataVars,
       CalendarDateUnit timeUnit, String altUnits, CFPointWriterConfig config) throws IOException {
     super(fileOut, globalAtts, dataVars, timeUnit, altUnits, config);
+    writer.addGroupAttribute(null, new Attribute(CF.FEATURE_TYPE, CF.FeatureType.point.name()));
+    writer.addGroupAttribute(null, new Attribute(CF.DSG_REPRESENTATION, "Point Data, H.1"));
   }
 
   public WriterCFPointCollection(String fileOut, List<Attribute> globalAtts, List<VariableSimpleIF> dataVars,

diff --git a/cdm/core/src/main/java/ucar/nc2/ft/point/writer2/WriterCFPointAbstract.java b/cdm/core/src/main/java/ucar/nc2/ft/point/writer2/WriterCFPointAbstract.java
@@ -40,6 +40,8 @@
 abstract class WriterCFPointAbstract implements Closeable {
   private static final Logger logger = LoggerFactory.getLogger(WriterCFPointAbstract.class);
 
+  private static final String CF_VERSION = "CF-1.9";
+
   static final String recordName = "obs";
   static final String recordDimName = "obs";
   static final String latName = "latitude";
@@ -126,7 +128,7 @@ abstract class WriterCFPointAbstract implements Closeable {
   }
 
   private void addGlobalAtts(AttributeContainer atts) {
-    writerb.addAttribute(new Attribute(CDM.CONVENTIONS, isExtendedModel ? CDM.CF_EXTENDED : "CF-1.6"));
+    writerb.addAttribute(new Attribute(CDM.CONVENTIONS, isExtendedModel ? CDM.CF_EXTENDED : CF_VERSION));
     writerb.addAttribute(new Attribute(CDM.HISTORY, "Written by CFPointWriter"));
     for (Attribute att : atts) {
       if (!reservedGlobalAtts.contains(att.getShortName()))

diff --git a/cdm/core/src/main/java/ucar/nc2/ft2/coverage/writer/CoverageAsPoint.java b/cdm/core/src/main/java/ucar/nc2/ft2/coverage/writer/CoverageAsPoint.java
@@ -27,7 +27,7 @@
 import ucar.unidata.util.StringUtil2;
 
 /**
- * Write DSG CF-1.6 file from a Coverage Dataset
+ * Write DSG CF-1.9 file from a Coverage Dataset
  *
  * @author caron
  * @since 7/8/2015