corrected MODIS attribute splitting

Author: TomBlock

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

@@ -496,15 +496,15 @@ protected void splitAttributes(Variable channelVariable, int index, int numChann
             if (dataType.isString()) {
                 final String stringValue = attribute.getStringValue();
                 final String[] tokens = StringUtils.split(stringValue, new char[]{','}, true);
-                if (tokens.length == numChannels && !attributeName.contains("valid_range")) {
+                if (tokens.length == numChannels) {
                     final Attribute newAttribute = new Attribute(attributeName, tokens[index]);
                     toAdd.add(newAttribute);
                 } else {
                     toAdd.add(attribute);
                 }
             } else if (dataType.isNumeric()) {
                 final int length = attribute.getLength();
-                if (length == numChannels) {
+                if (length == numChannels && !attributeName.contains("valid_range")) {
                     final Number numericValue = attribute.getNumericValue(index);
                     final Attribute newAttribute = new Attribute(attributeName, numericValue);
                     toAdd.add(newAttribute);

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

@@ -236,10 +236,12 @@ public void testGetVariables_Terra() throws IOException, InvalidRangeException {
         assertEquals("EV_250_Aggr1km_RefSB_ch01", variable.getShortName());
         assertEquals(DataType.USHORT, variable.getDataType());
         NCTestUtils.assertAttribute(variable, "corrected_counts_scales", "0.1249733");
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,32767");
 
         variable = variables.get(83);
         assertEquals("EV_250_Aggr1km_RefSB_Samples_Used_ch02", variable.getShortName());
         assertEquals(DataType.BYTE, variable.getDataType());
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,28");
 
         variable = variables.get(88);
         assertEquals("EV_500_Aggr1km_RefSB_ch07", variable.getShortName());
@@ -324,6 +326,7 @@ public void testGetVariables_Aqua() throws IOException, InvalidRangeException {
         assertEquals("EV_250_Aggr1km_RefSB_ch02", variable.getShortName());
         assertEquals(DataType.USHORT, variable.getDataType());
         NCTestUtils.assertAttribute(variable, "reflectance_scales", "2.8540927814901806E-5");
+        NCTestUtils.assertAttribute(variable, "valid_range", "0,32767");
 
         variable = variables.get(84);
         assertEquals("EV_500_Aggr1km_RefSB_ch03", variable.getShortName());