prevent valid range attribute from being split

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/modis/MxD021KM_Reader.java

@@ -449,7 +449,7 @@ private void ensureMod03File() throws IOException {
                 }
 
                 if (mxD03Reader == null) {
-                    throw new IOException("associated MxD03 file not found in: " + productPath.toString());
+                    throw new IOException("associated MxD03 file not found in: " + productPath);
                 }
             }
         }
@@ -492,11 +492,12 @@ protected void splitAttributes(Variable channelVariable, int index, int numChann
             toRemove.add(attribute);
 
             final DataType dataType = attribute.getDataType();
+            final String attributeName = attribute.getShortName();
             if (dataType.isString()) {
                 final String stringValue = attribute.getStringValue();
                 final String[] tokens = StringUtils.split(stringValue, new char[]{','}, true);
-                if (tokens.length == numChannels) {
-                    final Attribute newAttribute = new Attribute(attribute.getShortName(), tokens[index]);
+                if (tokens.length == numChannels && !attributeName.contains("valid_range")) {
+                    final Attribute newAttribute = new Attribute(attributeName, tokens[index]);
                     toAdd.add(newAttribute);
                 } else {
                     toAdd.add(attribute);
@@ -505,7 +506,7 @@ protected void splitAttributes(Variable channelVariable, int index, int numChann
                 final int length = attribute.getLength();
                 if (length == numChannels) {
                     final Number numericValue = attribute.getNumericValue(index);
-                    final Attribute newAttribute = new Attribute(attribute.getShortName(), numericValue);
+                    final Attribute newAttribute = new Attribute(attributeName, numericValue);
                     toAdd.add(newAttribute);
                 } else {
                     toAdd.add(attribute);

core/src/test/java/com/bc/fiduceo/NCTestUtils.java

@@ -20,7 +20,6 @@
 
 package com.bc.fiduceo;
 
-import com.bc.fiduceo.reader.netcdf.NetCDFReader;
 import com.bc.fiduceo.util.NetCDFUtils;
 import ucar.ma2.Array;
 import ucar.ma2.DataType;
@@ -32,8 +31,7 @@
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 public class NCTestUtils {
 
@@ -154,6 +152,32 @@ public static void assertAttribute(Variable variable, String attributeName, Stri
             assertEquals(expected, attribute.getStringValue());
         } else if (dataType == DataType.FLOAT) {
             assertEquals(Float.parseFloat(expected), attribute.getNumericValue().floatValue(), 1e-8);
+        } else if (dataType == DataType.SHORT) {
+            if (attribute.isArray()) {
+                final String[] segments = expected.split(",");
+                final Array values = attribute.getValues();
+                int i = 0;
+                for (final String segment : segments) {
+                    assertEquals(Short.parseShort(segment), values.getShort(i));
+                    ++i;
+                }
+            } else {
+                assertEquals(Short.parseShort(expected), attribute.getNumericValue());
+            }
+        } else if (dataType == DataType.BYTE) {
+            if (attribute.isArray()) {
+                final String[] segments = expected.split(",");
+                final Array values = attribute.getValues();
+                int i = 0;
+                for (final String segment : segments) {
+                    assertEquals(Byte.parseByte(segment), values.getByte(i));
+                    ++i;
+                }
+            } else {
+                assertEquals(Byte.parseByte(expected), attribute.getNumericValue());
+            }
+        } else {
+            fail("unsupported");
         }
     }
 

core/src/test/java/com/bc/fiduceo/reader/modis/MxD021KM_Reader_IO_Test.java

@@ -205,6 +205,7 @@ public void testGetVariables_Terra() throws IOException, InvalidRangeException {
         assertEquals("EV_1KM_RefSB_ch10", variable.getShortName());
         assertEquals(DataType.USHORT, variable.getDataType());
         NCTestUtils.assertAttribute(variable, "radiance_scales", "0.0036217605");
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,32767");
 
         variable = variables.get(34);
         assertEquals("EV_1KM_RefSB_Uncert_Indexes_ch11", variable.getShortName());
@@ -291,11 +292,13 @@ public void testGetVariables_Aqua() throws IOException, InvalidRangeException {
         assertEquals("EV_1KM_RefSB_ch11", variable.getShortName());
         assertEquals(DataType.USHORT, variable.getDataType());
         NCTestUtils.assertAttribute(variable, "band_names", "11");
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,32767");
 
         variable = variables.get(35);
         assertEquals("EV_1KM_RefSB_Uncert_Indexes_ch12", variable.getShortName());
         assertEquals(DataType.UBYTE, variable.getDataType());
         NCTestUtils.assertAttribute(variable, "specified_uncertainty", "1.5");
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,15");
 
         variable = variables.get(49);
         assertEquals("EV_1KM_Emissive_ch23", variable.getShortName());
@@ -335,6 +338,7 @@ public void testGetVariables_Aqua() throws IOException, InvalidRangeException {
         variable = variables.get(94);
         assertEquals("EV_500_Aggr1km_RefSB_Samples_Used_ch03", variable.getShortName());
         assertEquals(DataType.BYTE, variable.getDataType());
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,6");
 
         variable = variables.get(99);
         assertEquals("EV_Band26", variable.getShortName());