diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/OPSOptions.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/OPSOptions.java index c9c90850..02f95372 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/OPSOptions.java +++ b/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 */ diff --git a/source/imaer-util/src/main/java/nl/overheid/aerius/util/OptionsMetadataUtil.java b/source/imaer-util/src/main/java/nl/overheid/aerius/util/OptionsMetadataUtil.java index 2a57a7d6..3039aa2f 100644 --- a/source/imaer-util/src/main/java/nl/overheid/aerius/util/OptionsMetadataUtil.java +++ b/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, diff --git a/source/imaer-util/src/main/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtil.java b/source/imaer-util/src/main/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtil.java index e9957bf6..89a97169 100644 --- a/source/imaer-util/src/main/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtil.java +++ b/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 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"); } }