Fix raster getvaluesasstring method

Author: jericks

src/main/groovy/geoscript/layer/Raster.groovy

@@ -463,20 +463,21 @@ class Raster implements Renderable {
      */
     String getValuesAsString(Map options = [:], int x, int y, int w, int h, int band = 0) {
         boolean prettyPrint = options.get('prettyPrint', false)
+        int numberOfDecimals = options.get('numberOfDecimals', 2)
         String NEW_LINE = System.getProperty("line.separator")
         StringBuilder builder = new StringBuilder()
         List values = getValues(x, y, w, h, band, false)
         int maxLength = 0
-        int maxDecimal = 0
         values.eachWithIndex { List row, int r ->
             row.each { float n ->
-                String s = String.valueOf(n)
-                maxLength = Math.max(maxLength, s.length())
-                maxDecimal = Math.max(maxDecimal, s.indexOf('.') ? s.substring(s.indexOf('.')).length() - 1 : 0)
+                String s = String.valueOf(n.longValue())
+                maxLength = Math.max(maxLength, s.length() + numberOfDecimals + 1)
             }
         }
         NumberFormat nf = NumberFormat.getNumberInstance()
-        nf.setMinimumFractionDigits(maxDecimal)
+        nf.setMinimumFractionDigits(numberOfDecimals)
+        nf.setMaximumFractionDigits(numberOfDecimals)
+        nf.setGroupingUsed(false)
 
         String line = "-" * ((w * (maxLength + 3)) + 1)
         if (prettyPrint) {

src/test/groovy/geoscript/layer/RasterTestCase.groovy

@@ -842,15 +842,15 @@ class RasterTestCase {
                 [0.10, 0.45, 0.193, 0.2,  12.456, 0.2, 0.0]
         ]
         Raster raster = new Raster(data, bounds)
-        String str = raster.getValuesAsString(0, 0, 7, 5).denormalize()
+        String str = raster.getValuesAsString(0, 0, 7, 5, numberOfDecimals: 3).denormalize()
         assertEquals("""  0.100   0.450   0.193   0.200  12.456   0.200   0.000
   0.100   1.450   1.193   1.200 112.456   1.200   0.000
   0.100   1.450   2.193   3.200 212.456   1.200   0.000
   0.100   1.450   1.193   1.200 112.456   1.200   0.000
   0.100   0.450   0.193   0.200  12.456   0.200   0.000
 """.denormalize(), str)
 
-        str = raster.getValuesAsString(0, 0, 7, 5, prettyPrint: true).denormalize()
+        str = raster.getValuesAsString(0, 0, 7, 5, prettyPrint: true, numberOfDecimals: 3).denormalize()
         assertEquals("""-----------------------------------------------------------------------
 |   0.100 |   0.450 |   0.193 |   0.200 |  12.456 |   0.200 |   0.000 |
 -----------------------------------------------------------------------
@@ -866,6 +866,40 @@ class RasterTestCase {
 
     }
 
+    @Test void getLargeValuesAsString() {
+        Bounds bounds = new Bounds(7, 7, 17, 15, "EPSG:4326")
+        List data = [
+                [12120.10, 12120.45, 12120.193, 12120.2,  121212.456, 12120.2, 0.0],
+                [12120.10, 11212.45, 12121.193, 11212.2, 1121212.456, 11212.2, 0.0],
+                [1210.10,  12121.45, 21212.193, 31212.2, 2112122.456, 12121.2, 0.0],
+                [12.10,    11212.45, 11212.193, 12121.2, 1212112.456, 11212.2, 0.0],
+                [12120.10, 12120.45, 12120.193, 12120.2,  112122.456, 12120.2, 0.0]
+        ]
+        Raster raster = new Raster(data, bounds)
+        String str = raster.getValuesAsString(0, 0, 7, 5).denormalize()
+        assertEquals("""  12120.10   12120.45   12120.19   12120.20  121212.45   12120.20       0.00
+  12120.10   11212.45   12121.19   11212.20 1121212.50   11212.20       0.00
+   1210.10   12121.45   21212.19   31212.20 2112122.50   12121.20       0.00
+     12.10   11212.45   11212.19   12121.20 1212112.50   11212.20       0.00
+  12120.10   12120.45   12120.19   12120.20  112122.45   12120.20       0.00
+""".denormalize(), str)
+
+        str = raster.getValuesAsString(0, 0, 7, 5, prettyPrint: true).denormalize()
+        assertEquals("""--------------------------------------------------------------------------------------------
+|   12120.10 |   12120.45 |   12120.19 |   12120.20 |  121212.45 |   12120.20 |       0.00 |
+--------------------------------------------------------------------------------------------
+|   12120.10 |   11212.45 |   12121.19 |   11212.20 | 1121212.50 |   11212.20 |       0.00 |
+--------------------------------------------------------------------------------------------
+|    1210.10 |   12121.45 |   21212.19 |   31212.20 | 2112122.50 |   12121.20 |       0.00 |
+--------------------------------------------------------------------------------------------
+|      12.10 |   11212.45 |   11212.19 |   12121.20 | 1212112.50 |   11212.20 |       0.00 |
+--------------------------------------------------------------------------------------------
+|   12120.10 |   12120.45 |   12120.19 |   12120.20 |  112122.45 |   12120.20 |       0.00 |
+--------------------------------------------------------------------------------------------
+""".denormalize(), str)
+
+    }
+
     @Test void getData() {
         File file = new File(getClass().getClassLoader().getResource("alki.tif").toURI())
         GeoTIFF geoTIFF = new GeoTIFF(file)