svn commit: r1648149 - in /sis/branches/JDK8/core/sis-utility/src: main/java/org/apache/sis/measure/Units.java test/java/org/apache/sis/measure/UnitsTest.java

[desruisseaux]

Author: desruisseaux
Date: Sun Dec 28 05:22:43 2014
New Revision: 1648149

URL: http://svn.apache.org/r1648149
Log:
Support parsing of "degK" symbol for Kelvin. This symbol is used in some NetCDF 
files.

Modified:
    
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
    
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java

Modified: 
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1648149&r1=1648148&r2=1648149&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
 [UTF-8] Sun Dec 28 05:22:43 2014
@@ -55,7 +55,7 @@ public final class Units extends Static
      * Suffix at even index are for axes having the standard geometric 
direction,
      * while suffix at odd index are for axes having the reverse direction.
      */
-    private static final String[] DEGREE_SUFFIXES = {"east", "west", "north", 
"south"};
+    private static final String[] CARDINAL_DIRECTIONS = {"east", "west", 
"north", "south"};
 
     /**
      * Do not allows instantiation of this class.
@@ -374,15 +374,21 @@ public final class Units extends Static
          * Those suffixes are ignored.
          */
         if (uom.regionMatches(true, 0, "deg", 0, 3)) {
-            if (length == 3) {
-                return NonSI.DEGREE_ANGLE; // Exactly "deg"
+            switch (length) {
+                case 3: return NonSI.DEGREE_ANGLE; // Exactly "deg"
+                case 4: {
+                    if (uom.charAt(3) == 'K') {
+                        return SI.KELVIN; // Exactly "degK".
+                    }
+                    break;
+                }
             }
             String prefix = uom;
             boolean isTemperature = false;
             final int s = Math.max(uom.lastIndexOf(' '), uom.lastIndexOf('_'));
             if (s >= 1) {
                 final String suffix = (String) trimWhitespaces(uom, s+1, 
length);
-                if (ArraysExt.containsIgnoreCase(DEGREE_SUFFIXES, suffix) || 
(isTemperature = isCelsius(suffix))) {
+                if (ArraysExt.containsIgnoreCase(CARDINAL_DIRECTIONS, suffix) 
|| (isTemperature = isCelsius(suffix))) {
                     prefix = (String) trimWhitespaces(uom, 0, s); // Remove 
the suffix only if we recognized it.
                 }
             }

Modified: 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java?rev=1648149&r1=1648148&r2=1648149&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
 [UTF-8] Sun Dec 28 05:22:43 2014
@@ -256,6 +256,7 @@ public final strictfp class UnitsTest ex
         assertSame(KILOMETRE,    valueOf("kilomètres"));
         assertSame(KILOMETRE,    valueOf("kilometers"));
         assertSame(KELVIN,       valueOf("K"));
+        assertSame(KELVIN,       valueOf("degK"));
         assertSame(CELSIUS,      valueOf("Celsius"));
         assertSame(CELSIUS,      valueOf("degree Celsius"));
         assertSame(CELSIUS,      valueOf("degree_Celcius"));