Fix sonar issues

Author: bchapuis

baremaps-cli/src/main/java/org/apache/baremaps/cli/raster/Hillshade.java

@@ -208,7 +208,7 @@ public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
           return ByteBuffer.wrap(baos.toByteArray());
         }
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        throw new TileStoreException(e);
       }
     }
 
@@ -231,9 +231,7 @@ public void close() throws Exception {
   public class HillShadeTileResource {
 
     private static final Logger logger =
-        LoggerFactory.getLogger(org.apache.baremaps.server.TileResource.class);
-
-    // public static final String TILE_ENCODING = "gzip";
+        LoggerFactory.getLogger(HillShadeTileResource.class);
 
     public static final String TILE_TYPE = "image/png";
 
@@ -253,7 +251,6 @@ public HttpResponse tile(@Param("z") int z, @Param("x") int x, @Param("y") int y
         if (blob != null) {
           var headers = ResponseHeaders.builder(200)
               .add(CONTENT_TYPE, TILE_TYPE)
-              // .add(CONTENT_ENCODING, TILE_ENCODING)
               .add(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
               .build();
           byte[] bytes = new byte[blob.remaining()];
@@ -297,16 +294,11 @@ public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
       for (int level = -10000; level < 10000; level += 100) {
         var contours = new ContourTracer(grid, image.getWidth(), image.getHeight(), false, false)
             .traceContours(level);
-
         for (var contour : contours) {
-
           contour = AffineTransformation
               .translationInstance(-4, -4)
               .scale(16, 16)
               .transform(contour);
-
-          // contour = new ChaikinSmoother(2, 0.25).transform(contour);
-
           features.add(new Feature(level, Map.of("level", String.valueOf(level)), contour));
         }
       }
@@ -320,7 +312,7 @@ public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
         gzip.close();
         return ByteBuffer.wrap(baos.toByteArray());
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        throw new TileStoreException(e);
       }
 
     }

baremaps-cli/src/main/java/org/apache/baremaps/cli/raster/Raster.java

@@ -25,6 +25,7 @@
 @Command(name = "raster", description = "Raster processing commands.",
     subcommands = {Hillshade.class},
     sortOptions = false)
+@SuppressWarnings("squid:S106")
 public class Raster implements Runnable {
 
   @Override

baremaps-raster/src/main/java/org/apache/baremaps/raster/elevation/ContourTracer.java

@@ -132,6 +132,7 @@ private static void validateInput(double[] grid, int width, int height) {
     }
   }
 
+  @SuppressWarnings("squid:S3776")
   private List<LineString> processCell(double level, int x, int y) {
     List<LineString> segments = new ArrayList<>();
 
@@ -140,11 +141,11 @@ private List<LineString> processCell(double level, int x, int y) {
     boolean hbb = polygonize && y == 0;
     boolean hlb = polygonize && x == 0;
 
-    Coordinate tlc = new Coordinate(x, y + 1);
+    Coordinate tlc = new Coordinate(x, y + 1.0);
     Coordinate tmc = interpolateCoordinate(level, x, y + 1, x + 1, y + 1);
-    Coordinate trc = new Coordinate(x + 1, y + 1);
+    Coordinate trc = new Coordinate(x + 1.0, y + 1.0);
     Coordinate mrc = interpolateCoordinate(level, x + 1, y, x + 1, y + 1);
-    Coordinate brc = new Coordinate(x + 1, y);
+    Coordinate brc = new Coordinate(x + 1.0, y);
     Coordinate bmc = interpolateCoordinate(level, x, y, x + 1, y);
     Coordinate blc = new Coordinate(x, y);
     Coordinate mlc = interpolateCoordinate(level, x, y, x, y + 1);
@@ -351,6 +352,9 @@ private List<LineString> processCell(double level, int x, int y) {
           segments.add(createSegment(blc, tlc));
         }
       }
+      default -> {
+        // No segments
+      }
     }
 
     return segments;

baremaps-raster/src/main/java/org/apache/baremaps/raster/elevation/ElevationUtils.java

@@ -18,7 +18,9 @@
 package org.apache.baremaps.raster.elevation;
 
 import java.awt.image.BufferedImage;
+import java.util.function.DoubleToIntFunction;
 import java.util.function.Function;
+import java.util.function.IntToDoubleFunction;
 
 /**
  * Provides utility methods for processing raster images, particularly for elevation data.
@@ -39,15 +41,16 @@ private ElevationUtils() {
    * @return A double array representing the elevation grid
    */
   public static double[] imageToGrid(BufferedImage image,
-      Function<Integer, Double> pixelToElevation) {
+      IntToDoubleFunction pixelToElevation) {
     validateImage(image);
     int width = image.getWidth();
     int height = image.getHeight();
     double[] grid = new double[width * height];
 
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
-        grid[y * width + x] = pixelToElevation.apply(image.getRGB(x, y));
+        int rgb = image.getRGB(x, y);
+        grid[y * width + x] = pixelToElevation.applyAsDouble(rgb);
       }
     }
 
@@ -63,13 +66,14 @@ public static double[] imageToGrid(BufferedImage image,
    * @return A BufferedImage representing the elevation data
    */
   public static BufferedImage gridToImage(double[] grid, int width, int height,
-      Function<Double, Integer> elevationToPixel) {
+                                          DoubleToIntFunction elevationToPixel) {
     validateGrid(grid, width, height);
     BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
-        image.setRGB(x, y, elevationToPixel.apply(grid[y * width + x]));
+        double elevation = grid[y * width + x];
+        image.setRGB(x, y, elevationToPixel.applyAsInt(elevation));
       }
     }
 
@@ -90,7 +94,7 @@ public static double pixelToElevationTerrarium(int rgb) {
     return (r * 256 + g + b / 256) - 32768;
   }
 
-  private static int elevationToPixel(double elevation) {
+  public static int elevationToPixel(double elevation) {
     int value = (int) ((elevation + ELEVATION_OFFSET) * 10.0);
     int r = (value >> 16) & 0xFF;
     int g = (value >> 8) & 0xFF;