Skip to content

AER-4087 Add reposition_sub_receptors to OwN2000CalculationOptions. #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hilbrand merged 2 commits into from
Dec 2, 2025
Merged

AER-4087 Add reposition_sub_receptors to OwN2000CalculationOptions. #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bb29b8
AER-4087 Add reposition_sub_receptors to OwN2000CalculationOptions.
Hilbrand Dec 1, 2025
a9e77cf
review comment, don't make repositionSubReceptors true
Hilbrand Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ...src/main/java/nl/overheid/aerius/shared/domain/calculation/OwN2000CalculationOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
public class OwN2000CalculationOptions implements Serializable {

private static final long serialVersionUID = 2L;
private static final long serialVersionUID = 3L;

private CalculationRoadOPS roadOPS = CalculationRoadOPS.DEFAULT;
private PermitLowerBoundType permitLowerBoundType;
Expand All @@ -42,6 +42,7 @@ public class OwN2000CalculationOptions implements Serializable {
private Integer subReceptorZoomLevel;
private boolean splitSubReceptorWork;
private int splitSubReceptorWorkDistance;
private boolean repositionSubReceptors;

/**
* @return Returns the lower bound type used for permit calculations.
Expand Down Expand Up @@ -212,6 +213,14 @@ public void setSplitSubReceptorWorkDistance(final int distance) {
this.splitSubReceptorWorkDistance = distance;
}

public boolean isRepositionSubReceptors() {
return repositionSubReceptors;
}

public void setRepositionSubReceptors(final boolean repositionSubReceptors) {
this.repositionSubReceptors = repositionSubReceptors;
}

/**
* @return Returns OPS specific options.
*/
Expand Down
1 change: 1 addition & 0 deletions source/imaer-util/src/main/java/nl/overheid/aerius/util/OptionsMetadataUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public enum Option {
SUB_RECEPTOR_ZOOM_LEVEL,
SPLIT_SUB_RECEPTOR_WORK,
SPLIT_SUB_RECEPTOR_WORK_DISTANCE,
REPOSITION_SUB_RECEPTORS,
USE_IN_COMBINATION_ARCHIVE,

/* ConnectSuppliedOptions related */
Expand Down
1 change: 1 addition & 0 deletions source/imaer-util/src/main/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ private static void own2000OptionsToMap(final Map<String, String> mapToAddTo, fi
if (options.isSplitSubReceptorWork()) {
addValue(mapToAddTo, Option.SPLIT_SUB_RECEPTOR_WORK_DISTANCE, options.getSplitSubReceptorWorkDistance(), addDefaults);
}
addBooleanValue(mapToAddTo, Option.REPOSITION_SUB_RECEPTORS, options.isRepositionSubReceptors(), addDefaults);
opsOptionsToMap(options.getOpsOptions(), mapToAddTo, addDefaults);
}

Expand Down
4 changes: 3 additions & 1 deletion source/imaer-util/src/test/java/nl/overheid/aerius/util/Own2000OptionsMetadataUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/
class Own2000OptionsMetadataUtilTest {

private static final int BASIC_OPTIONS = 10;
private static final int BASIC_OPTIONS = 11;
private static final int CONNECT_OPTIONS = 2;
private static final int OPS_OPTIONS = 13;

Expand Down Expand Up @@ -85,6 +85,7 @@ void testNonDefaultOptions() {
options.setSubReceptorZoomLevel(1);
options.setSplitSubReceptorWork(true);
options.setSplitSubReceptorWorkDistance(1000);
options.setRepositionSubReceptors(true);
cso.getRblCalculationOptions().setMonitorSrm2Year(2023);

final Map<String, String> result = OptionsMetadataUtil.optionsToMap(Theme.OWN2000, cso, false);
Expand All @@ -103,6 +104,7 @@ void testNonDefaultOptions() {
assertEquals("2023", result.get("monitor_srm2_year"), "Invalid monitor_srm2 option");
assertEquals("true", result.get("split_sub_receptor_work"), "Invalid split_sub_receptor_work option");
assertEquals("1000", result.get("split_sub_receptor_work_distance"), "Invalid split_sub_receptor_work_distance option");
assertEquals("true", result.get("reposition_sub_receptors"), "Invalid reposition_sub_receptor option");
}

@Test
Expand Down