AER-4131 Added support to be able to configure ROADSOpt. (#357)

Author: Hilbrand

source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/OPSOptions.java

@@ -33,6 +33,7 @@ public class OPSOptions implements Serializable {
   private String washout;
   private String convRate;
   private String roads;
+  private String roadsOpt;
   private Double roughness;
   private Chemistry chemistry;
 
@@ -48,7 +49,7 @@ public Integer getCompCode() {
     return compCode;
   }
 
-  public void setCompCode(Integer compCode) {
+  public void setCompCode(final Integer compCode) {
     this.compCode = compCode;
   }
 
@@ -71,7 +72,7 @@ public Chemistry getChemistry() {
     return chemistry;
   }
 
-  public void setChemistry(Chemistry chemistry) {
+  public void setChemistry(final Chemistry chemistry) {
     this.chemistry = chemistry;
   }
 
@@ -159,6 +160,17 @@ public void setRoads(final String roads) {
     this.roads = roads;
   }
 
+  /**
+   * OPS .ctr variable: ROADSopt
+   */
+  public String getRoadsOpt() {
+    return roadsOpt;
+  }
+
+  public void setRoadsOpt(final String roadsOpt) {
+    this.roadsOpt = roadsOpt;
+  }
+
   /**
    * OPS .ctr variable: ROUGHNESS
    */

source/imaer-util/src/main/java/nl/overheid/aerius/util/OptionsMetadataUtil.java

@@ -66,6 +66,7 @@ public enum Option {
     OPS_ROUGHNESS,
     OPS_CHEMISTRY,
     OPS_ROADS,
+    OPS_ROADS_OPT,
 
     /* ADMS options related */
     ADMS_VERSION,

source/imaer-util/src/main/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtil.java

@@ -101,6 +101,7 @@ private static void opsOptionsToMap(final OPSOptions options, final Map<String,
       addValue(mapToAddTo, Option.OPS_CONV_RATE, options.getConvRate(), addDefaults);
       addValue(mapToAddTo, Option.OPS_ROUGHNESS, options.getRoughness(), addDefaults);
       addValue(mapToAddTo, Option.OPS_ROADS, options.getRoads(), addDefaults);
+      addValue(mapToAddTo, Option.OPS_ROADS_OPT, options.getRoadsOpt(), addDefaults);
     }
   }
 }

source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java

@@ -41,7 +41,7 @@ class Own2000OptionsMetadataUtilTest {
 
   private static final int BASIC_OPTIONS = 10;
   private static final int CONNECT_OPTIONS = 2;
-  private static final int OPS_OPTIONS = 12;
+  private static final int OPS_OPTIONS = 13;
 
   @Test
   void testDefaultOptionsWithoutAddingDefaults() {
@@ -172,6 +172,7 @@ void testNonDefaultOptionsOps() {
     opsOptions.setRoughness(8.19);
     opsOptions.setChemistry(OPSOptions.Chemistry.PROGNOSIS);
     opsOptions.setRoads("3030");
+    opsOptions.setRoadsOpt("0 1");
     options.getOwN2000CalculationOptions().setOpsOptions(opsOptions);
 
     final Map<String, String> result = OptionsMetadataUtil.optionsToMap(Theme.OWN2000, options, false);
@@ -189,5 +190,6 @@ void testNonDefaultOptionsOps() {
     assertEquals("8.19", result.get("ops_roughness"), "ops_roughness should be set");
     assertEquals("PROGNOSIS", result.get("ops_chemistry"), "ops_chemistry should be set");
     assertEquals("3030", result.get("ops_roads"), "ops_roads should be set");
+    assertEquals("0 1", result.get("ops_roads_opt"), "ops_roads_opt should be set");
   }
 }