Fix issues detected by sonar

Author: bchapuis

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

@@ -90,7 +90,7 @@ public static double pixelToElevationTerrarium(int rgb) {
     int r = (rgb >> 16) & 0xFF;
     int g = (rgb >> 8) & 0xFF;
     int b = rgb & 0xFF;
-    return (r * 256 + g + b / 256) - 32768;
+    return (r * 256.0 + g + b / 256.0) - 32768.0;
   }
 
   public static int elevationToPixel(double elevation) {

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

@@ -54,30 +54,6 @@ public double[] calculate(double sunAltitude, double sunAzimuth) {
     return calculateHillshade(sunAltitude, sunAzimuth);
   }
 
-  /**
-   * Generates a hillshade effect on the given DEM.
-   *
-   * @param sunAltitude The sun's altitude in degrees
-   * @param sunAzimuth The sun's azimuth in degrees
-   * @return An array representing the hillshade effect
-   */
-  public double[] calculate(double sunAltitude, double sunAzimuth, double scale, boolean isSimple) {
-    validateInput(dem, width, height, sunAltitude, sunAzimuth);
-    return calculateHillshade(sunAltitude, sunAzimuth);
-  }
-
-  /**
-   * Generates an enhanced hillshade effect on the given DEM.
-   *
-   * @param sunAltitude The sun's altitude in degrees
-   * @param sunAzimuth The sun's azimuth in degrees
-   * @return An array representing the enhanced hillshade effect
-   */
-  public double[] calculateEnhanced(double sunAltitude, double sunAzimuth) {
-    validateInput(dem, width, height, sunAltitude, sunAzimuth);
-    return calculateHillshade(sunAltitude, sunAzimuth);
-  }
-
   private static void validateInput(double[] dem, int width, int height, double sunAltitude,
       double sunAzimuth) {
     if (dem == null || dem.length == 0) {
@@ -112,7 +88,8 @@ private double[] calculateHillshade(double sunAltitude, double sunAzimuth) {
         int left = Math.max(x - 1, 0);
         int right = Math.min(x + 1, width - 1);
 
-        double dzdx, dzdy;
+        double dzdx;
+        double dzdy;
         if (isSimple) {
           dzdx = (dem[y * width + right] - dem[y * width + left]) / 2.0;
           dzdy = (dem[bottom * width + x] - dem[top * width + x]) / 2.0;

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

@@ -21,6 +21,11 @@
 import java.awt.image.BufferedImage;
 
 public class RasterUtils {
+
+  private RasterUtils() {
+    // Private constructor to prevent instantiation
+  }
+
   public static BufferedImage resizeImage(
       BufferedImage originalImage, int targetWidth, int targetHeight) {
     Image resultingImage =

baremaps-raster/src/main/java/org/apache/baremaps/raster/martini/Martini.java

@@ -54,7 +54,12 @@ public Martini(int gridSize) {
     this.baseCoords = new int[this.numTriangles * 4];
     for (int i = 0; i < this.numTriangles; i++) {
       int id = i + 2;
-      int ax = 0, ay = 0, bx = 0, by = 0, cx = 0, cy = 0;
+      int ax = 0;
+      int ay = 0;
+      int bx = 0;
+      int by = 0;
+      int cx = 0;
+      int cy = 0;
       if ((id & 1) != 0) {
         bx = by = cx = tileSize;
       } else {

baremaps-raster/src/test/java/org/apache/baremaps/raster/elevation/ChaikinSmootherTest.java

@@ -34,9 +34,7 @@ void smoothLineString() {
         new Coordinate(1, 1),
     });
     Geometry smoothedLineString = new ChaikinSmoother(2, 0.25).transform(lineString);
-    System.out.println(smoothedLineString);
+    assertEquals("LINESTRING (0 0, 0.375 0.375, 0.625 0.625, 0.75 0.75, 1 1)",
+        smoothedLineString.toString());
   }
-
-
-
 }

baremaps-raster/src/test/java/org/apache/baremaps/raster/elevation/ContourRenderer.java

@@ -96,8 +96,8 @@ public void paint(Graphics g) {
       g.drawImage(image, 10, 10, null);
 
       g.setColor(Color.RED);
-      for (Geometry contour : contour) {
-        List<Point> points = Stream.of(contour.getCoordinates())
+      for (Geometry geometry : contour) {
+        List<Point> points = Stream.of(geometry.getCoordinates())
             .map(p -> new Point((int) p.getX() + 10, (int) p.getY() + 10))
             .toList();
         for (int i = 0; i < points.size() - 1; i++) {

baremaps-raster/src/test/java/org/apache/baremaps/raster/elevation/ContourTracerTest.java

@@ -28,7 +28,7 @@
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKTReader;
 
-public class ContourTracerTest {
+class ContourTracerTest {
 
   @Test
   @DisplayName("Test grid normalization")

baremaps-raster/src/test/java/org/apache/baremaps/raster/elevation/HillshadeCalculatorTest.java

@@ -122,24 +122,4 @@ void testHillShadeOutputRange() {
       assertTrue(value >= 0 && value <= 255, "Hillshade value should be between 0 and 255");
     }
   }
-
-  @Test
-  @DisplayName("Test hillShadeEnhanced output range")
-  void testHillShadeEnhancedOutputRange() {
-    double[] dem = new double[100];
-    for (int i = 0; i < dem.length; i++) {
-      dem[i] = Math.random() * 1000;
-    }
-    int width = 10;
-    int height = 10;
-    double sunAltitude = 45;
-    double sunAzimuth = 315;
-
-    double[] result =
-        new HillshadeCalculator(dem, width, height, 1, true).calculate(sunAltitude, sunAzimuth);
-
-    for (double value : result) {
-      assertTrue(value >= 0 && value <= 255, "Hillshade value should be between 0 and 255");
-    }
-  }
 }

baremaps-raster/src/test/java/org/apache/baremaps/raster/martini/MartiniTest.java

@@ -24,10 +24,10 @@
 import javax.imageio.ImageIO;
 import org.junit.jupiter.api.Test;
 
-public class MartiniTest {
+class MartiniTest {
 
   @Test
-  public void generateAMesh() throws IOException {
+  void generateAMesh() throws IOException {
     var png = ImageIO.read(
         Path.of("")
             .toAbsolutePath()

baremaps-server/src/main/resources/raster/hillshade.html

@@ -60,24 +60,21 @@
                     'type': 'line',
                     'source': 'contourSource',
                     'source-layer': 'elevation',
-                    'layout': {},
+                    'layout': {
+                        'line-join': 'round',
+                        'line-cap': 'round',
+                    },
                     'paint': {
                         'line-color': '#f00',
                         'line-width': 1,
                     },
-                    layout: {
-                        'line-join': 'round',
-                        'line-cap': 'round',
-                    },
                 },
             ],
         },
         maxZoom: 18,
         maxPitch: 85
     }));
-
-    // map.showTileBoundaries = true;
-
+    
     map.addControl(
         new maplibregl.NavigationControl({
             visualizePitch: false,