From 8876cc15510da721f95331f85cf02b410720bb2d Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Tue, 27 Jan 2026 09:29:19 +0100 Subject: [PATCH] AER-2838 Rename RBL reference to CIMLK. --- .../test/java/nl/overheid/aerius/gml/GMLReaderTest.java | 2 +- .../test/java/nl/overheid/aerius/gml/GMLWriterTest.java | 2 +- ...lculationOptions.java => CIMLKCalculationOptions.java} | 6 +++--- .../shared/domain/calculation/CalculationSetOptions.java | 8 ++++---- .../overheid/aerius/util/Own2000OptionsMetadataUtil.java | 2 +- .../aerius/util/Own2000OptionsMetadataUtilTest.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/{RBLCalculationOptions.java => CIMLKCalculationOptions.java} (88%) diff --git a/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLReaderTest.java b/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLReaderTest.java index ea8dbb5b..637e4bf9 100644 --- a/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLReaderTest.java +++ b/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLReaderTest.java @@ -218,7 +218,7 @@ private static MetaData getMetaData() throws AeriusException { metaDataInput.setVersion(VERSION); metaDataInput.setDatabaseVersion(DATABASE_VERSION); metaDataInput.getOptions().setCalculationMethod(CalculationMethod.FORMAL_ASSESSMENT); - metaDataInput.getOptions().getRblCalculationOptions().setMonitorSrm2Year(MONITOR_SRM2_YEAR); + metaDataInput.getOptions().getCimlkCalculationOptions().setMonitorSrm2Year(MONITOR_SRM2_YEAR); metaDataInput.setResultsIncluded(true); final InternalGMLWriter writer = new InternalGMLWriter(ReceptorGridSettings.NL, GMLTestDomain.TEST_REFERENCE_GENERATOR, Boolean.TRUE, GMLWriter.LATEST_WRITER_VERSION, true); diff --git a/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLWriterTest.java b/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLWriterTest.java index d1ed5b54..245c28d2 100644 --- a/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLWriterTest.java +++ b/source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLWriterTest.java @@ -183,7 +183,7 @@ private CalculationSetOptions getCalculationOptions() { options.setCalculationMethod(CalculationMethod.NATURE_AREA); options.setMaximumRangeRelevant(true); options.setCalculateMaximumRange(3); - options.getRblCalculationOptions().setMonitorSrm2Year(2030); + options.getCimlkCalculationOptions().setMonitorSrm2Year(2030); options.getSubstances().add(Substance.NOX); options.getSubstances().add(Substance.NH3); options.getSubstances().add(Substance.NO2); diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/RBLCalculationOptions.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CIMLKCalculationOptions.java similarity index 88% rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/RBLCalculationOptions.java rename to source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CIMLKCalculationOptions.java index 004aefe8..581e9cd5 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/RBLCalculationOptions.java +++ b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CIMLKCalculationOptions.java @@ -19,9 +19,9 @@ import java.io.Serializable; /** - * Calculation options related to the RBL theme. + * Calculation options related to the CIMLK theme. */ -public class RBLCalculationOptions implements Serializable { +public class CIMLKCalculationOptions implements Serializable { private static final long serialVersionUID = 1L; @@ -45,7 +45,7 @@ public String getSrmVersion() { return srmVersion; } - public void setSrmVersion(String srmVersion) { + public void setSrmVersion(final String srmVersion) { this.srmVersion = srmVersion; } } diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationSetOptions.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationSetOptions.java index 314ce254..5efc7031 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationSetOptions.java +++ b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/calculation/CalculationSetOptions.java @@ -40,7 +40,7 @@ public class CalculationSetOptions implements Serializable { private final ArrayList substances = new ArrayList<>(); private final Set emissionResultKeys = new HashSet<>(); private OwN2000CalculationOptions owN2000CalculationOptions = new OwN2000CalculationOptions(); - private RBLCalculationOptions rblCalculationOptions = new RBLCalculationOptions(); + private CIMLKCalculationOptions cimlkCalculationOptions = new CIMLKCalculationOptions(); private NCACalculationOptions ncaCalculationOptions = new NCACalculationOptions(); private CalculatedSnapshotValues calculatedSnapshotValues = new CalculatedSnapshotValues(); private Serializable experimentalOptions; @@ -143,8 +143,8 @@ public OwN2000CalculationOptions getOwN2000CalculationOptions() { return owN2000CalculationOptions; } - public RBLCalculationOptions getRblCalculationOptions() { - return rblCalculationOptions; + public CIMLKCalculationOptions getCimlkCalculationOptions() { + return cimlkCalculationOptions; } public NCACalculationOptions getNcaCalculationOptions() { @@ -174,6 +174,6 @@ public String toString() { return "CalculationSetOptions [calculationSetOptionsId=" + calculationSetOptionsId + ", calculationMethod=" + calculationMethod + ", calculateMaximumRange=" + calculateMaximumRange + ", substances=" + substances + ", emissionResultKeys=" + emissionResultKeys + ", stacking=" + stacking + ", connectSuppliedOptions=" + connectSuppliedOptions + ", own2000CalculationOptions=" + owN2000CalculationOptions - + ", rblCalculationOptions=" + rblCalculationOptions + ", ncaCalculationOptions=" + ncaCalculationOptions + "]"; + + ", cimlkCalculationOptions=" + cimlkCalculationOptions + ", ncaCalculationOptions=" + ncaCalculationOptions + "]"; } } 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 c90a0bd1..a6ab23f2 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 @@ -58,7 +58,7 @@ static void own2000CalculationSetOptionsFromMap(final Map map, f */ static void own2000CalculationSetOptionsToMap(final CalculationSetOptions options, final Map mapToAddTo, final boolean addDefaults) { own2000OptionsToMap(mapToAddTo, options.getOwN2000CalculationOptions(), addDefaults); - addIntValue(mapToAddTo, Option.MONITOR_SRM2_YEAR, options.getRblCalculationOptions().getMonitorSrm2Year(), addDefaults); + addIntValue(mapToAddTo, Option.MONITOR_SRM2_YEAR, options.getCimlkCalculationOptions().getMonitorSrm2Year(), addDefaults); } private static void own2000OptionsToMap(final Map mapToAddTo, final OwN2000CalculationOptions options, final boolean addDefaults) { diff --git a/source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java index 993564da..01ff2820 100644 --- a/source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java +++ b/source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java @@ -86,7 +86,7 @@ void testNonDefaultOptions() { options.setSplitSubReceptorWork(true); options.setSplitSubReceptorWorkDistance(1000); options.setRepositionSubReceptors(true); - cso.getRblCalculationOptions().setMonitorSrm2Year(2023); + cso.getCimlkCalculationOptions().setMonitorSrm2Year(2023); final Map result = OptionsMetadataUtil.optionsToMap(Theme.OWN2000, cso, false); // is BASIC_OPTIONS + 1 because SplitSubReceptorWorkDistance is by default not set when SplitSubReceptorWork is false