feat: update snap radius and max attempts options in command line parser and tests

Author: MichaelsJP

docs/technical-details/api-benchmarks/coordinate-generators.md

@@ -1,6 +1,10 @@
 # Coordinate Generation Tools
 
-The openrouteservice provides tools for generating test coordinates that can be used for benchmarking, testing, and development purposes. These tools allow you to create realistic coordinates that are compatible with the openrouteservice API and suited for different routing profiles.
+The openroutes| `-r, --snap-radius` | Search radius in meters for coordinate snapping. | 350 |
+| `-ma, --max-attempts` | Maximum number of attempts for coordinate generation. | 100 |vice provides tools for
+generating test coordinates that can be used for benchmarking, testing, and development purposes. These tools allow you
+to create realistic coordinates that are compatible with the openrouteservice API and suited for different routing
+profiles.
 
 ## Prerequisites
 
@@ -43,8 +47,8 @@ The tool generates random coordinates within a specified bounding box and then u
 | `-d, --min-distance`  | Minimum distance between start and endpoint in an a-to-b routing pair in meters. This is valid for all profiles. | 1                           |
 | `-m, --max-distances` | Maximum distances in meters **per profile** between the start and endpoint.                                      | (none)                      |
 | `-t, --threads`       | Number of threads to use.                                                                                        | Available processors        |
-| `-sr, --snap-radius`  | Search radius in meters for coordinate snapping.                                                                 | 1000                        |
-| `-ma, --max-attempts` | Maximum number of attempts for coordinate generation.                                                            | 1000                        |
+| `-sr, --snap-radius`  | Search radius in meters for coordinate snapping.                                                                 | 350                         |
+| `-ma, --max-attempts` | Maximum number of attempts for coordinate generation.                                                            | 100                         |
 
 ### Route Generator Examples
 
@@ -101,10 +105,10 @@ The tool generates random coordinates within a specified bounding box and then u
 | `-n, --num-points`    | Number of points to generate per profile.             | (required)                  |
 | `-e, --extent`        | Bounding box (minLon,minLat,maxLon,maxLat).           | (required)                  |
 | `-p, --profiles`      | Comma-separated list of routing profiles.             | (required)                  |
-| `-r, --radius`        | Search radius in meters.                              | 350                         |
+| `-sr, --snap-radius`  | Search radius in metersfor coordinate snapping.       | 350                         |
 | `-u, --url`           | ORS API base URL.                                     | <http://localhost:8080/ors> |
 | `-o, --output`        | Output CSV file path.                                 | snapped_coordinates.csv     |
-| `-ma, --max-attempts` | Maximum number of attempts for coordinate generation. | 1000                        |
+| `-ma, --max-attempts` | Maximum number of attempts for coordinate generation. | 100                         |
 
 ### Snapping Generator Examples
 
@@ -119,7 +123,7 @@ Generate 100 snapped points for the driving-car profile with a search radius of
   -n 100 \
   -e 8.6,49.3,8.7,49.4 \
   -p driving-car \
-  -r 500 \
+  -sr 500 \
   -u http://localhost:8080/ors \
   -o snapped.csv"
 ```
@@ -135,7 +139,7 @@ Generate 50 snapped points for both driving-car and cycling-regular profiles:
   --num-points 50 \
   --extent 8.681495,49.411721,8.695485,49.419365 \
   --profiles driving-car,cycling-regular \
-  --radius 250 \
+  --snap-radius 250 \
   --max-attempts 1500 \
   --url http://localhost:8080/ors \
   --output snapped.csv"

ors-benchmark/src/main/java/org/heigit/ors/coordinates_generator/cli/SnappingCommandLineParser.java

@@ -36,8 +36,8 @@ protected void setupOptions() {
                 .desc("Bounding box (minLon minLat maxLon maxLat)")
                 .build());
 
-        options.addOption(Option.builder("r")
-                .longOpt("radius")
+        options.addOption(Option.builder("sr")
+                .longOpt("snap-radius")
                 .hasArg()
                 .type(Number.class)
                 .desc("Search radius in meters (default: 350)")
@@ -66,7 +66,7 @@ protected void setupOptions() {
                 .longOpt(OPT_MAX_ATTEMPTS)
                 .hasArg()
                 .type(Number.class)
-                .desc("Maximum number of attempts for coordinate generation (default: 1000)")
+                .desc("Maximum number of attempts for coordinate generation (default: 100)")
                 .build());
     }
 
@@ -94,16 +94,16 @@ public CoordinateGeneratorSnapping createGenerator() {
         int numPoints = Integer.parseInt(cmd.getOptionValue("n"));
         double[] extent = parseExtent(cmd.getOptionValue("e"));
         String[] profiles = parseProfiles(cmd.getOptionValue("p"));
-        double radius = Double.parseDouble(cmd.getOptionValue("r", "350"));
+        double snapRadius = Double.parseDouble(cmd.getOptionValue("sr", "350"));
         String baseUrl = cmd.getOptionValue("u", "http://localhost:8080/ors");
         int maxAttempts = Integer.parseInt(
                 cmd.getOptionValue(OPT_MAX_ATTEMPTS, "100"));
 
         LOGGER.info(
-                "Creating CoordinateGeneratorSnapping with numPoints={}, extent={}, radius={}, profiles={}, baseUrl={}, maxAttempts={}",
-                numPoints, extent, radius, profiles, baseUrl, maxAttempts);
+                "Creating CoordinateGeneratorSnapping with numPoints={}, extent={}, snapRadius={}, profiles={}, baseUrl={}, maxAttempts={}",
+                numPoints, extent, snapRadius, profiles, baseUrl, maxAttempts);
 
-        CoordinateGeneratorSnapping generator = new CoordinateGeneratorSnapping(numPoints, extent, radius, profiles,
+        CoordinateGeneratorSnapping generator = new CoordinateGeneratorSnapping(numPoints, extent, snapRadius, profiles,
                 baseUrl, maxAttempts);
         generator.generate();
         return generator;

ors-benchmark/src/test/java/org/heigit/ors/coordinates_generator/cli/SnappingCommandLineParserTest.java

@@ -2,11 +2,14 @@
 
 import org.heigit.ors.benchmark.exceptions.CommandLineParsingException;
 import org.heigit.ors.coordinates_generator.generators.CoordinateGeneratorSnapping;
+import org.heigit.ors.coordinates_generator.service.CoordinateSnapper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.lang.reflect.Field;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 class SnappingCommandLineParserTest {
@@ -17,8 +20,8 @@ void testValidCliArguments() {
             "-n", "100",
                 "-e", "8.6,49.3,8.7,49.4",
                     "-p", "driving-car,cycling-regular",
-            "-r", "350",
-            "-u", "http://localhost:8080/ors"
+                "-sr", "350",
+                "-u", "http://localhost:8080/ors"
         };
 
         SnappingCommandLineParser cli = new SnappingCommandLineParser(args);
@@ -200,4 +203,55 @@ void testMaxAttempts() {
         // We're verifying that the CLI parser correctly reads the value and the
         // generator is created successfully
     }
+
+    @Test
+    void testSnapRadius() {
+        String[] args = {
+                "-n", "100",
+                "-e", "8.6 49.3 8.7 49.4",
+                "-p", "driving-car",
+                "-sr", "500"
+        };
+
+        SnappingCommandLineParser cli = new SnappingCommandLineParser(args);
+        CoordinateGeneratorSnapping generator = cli.createGenerator();
+        assertNotNull(generator);
+
+        // Test snapRadius using reflection to verify it was correctly passed to the
+        // coordinate snapper
+        assertDoesNotThrow(() -> {
+            Field coordinateSnapperField = CoordinateGeneratorSnapping.class.getDeclaredField("coordinateSnapper");
+            coordinateSnapperField.setAccessible(true);
+            CoordinateSnapper snapper = (CoordinateSnapper) coordinateSnapperField.get(generator);
+
+            Field snapRadiusField = CoordinateSnapper.class.getDeclaredField("snapRadius");
+            snapRadiusField.setAccessible(true);
+            assertEquals(500.0, snapRadiusField.getDouble(snapper), 0.001, "Snap radius should be set correctly");
+        });
+    }
+
+    @Test
+    void testDefaultSnapRadius() {
+        String[] args = {
+                "-n", "100",
+                "-e", "8.6 49.3 8.7 49.4",
+                "-p", "driving-car"
+                // No -sr parameter, should use default value
+        };
+
+        SnappingCommandLineParser cli = new SnappingCommandLineParser(args);
+        CoordinateGeneratorSnapping generator = cli.createGenerator();
+        assertNotNull(generator);
+
+        // Test snapRadius using reflection to verify the default value was used
+        assertDoesNotThrow(() -> {
+            Field coordinateSnapperField = CoordinateGeneratorSnapping.class.getDeclaredField("coordinateSnapper");
+            coordinateSnapperField.setAccessible(true);
+            CoordinateSnapper snapper = (CoordinateSnapper) coordinateSnapperField.get(generator);
+
+            Field snapRadiusField = CoordinateSnapper.class.getDeclaredField("snapRadius");
+            snapRadiusField.setAccessible(true);
+            assertEquals(350.0, snapRadiusField.getDouble(snapper), 0.001, "Default snap radius should be 350");
+        });
+    }
 }