Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ private static void own2000OptionsToMap(final Map<String, String> mapToAddTo, fi
}
addBooleanValue(mapToAddTo, Option.FORCED_AGGREGATION, options.isForceAggregation(), addDefaults);
addBooleanValue(mapToAddTo, Option.USE_RECEPTOR_HEIGHT, options.isUseReceptorHeights(), addDefaults);
addPermitLowerBound(mapToAddTo, options);
// TODO AER-4028: re-add permitLowerBound when parameter returns to Connect API
// addPermitLowerBound(mapToAddTo, options);
addBooleanValue(mapToAddTo, Option.WITH_MAX_DISTANCE, options.isUseMaxDistance(), addDefaults);
addValue(mapToAddTo, Option.SUB_RECEPTORS_MODE, options.getSubReceptorsMode(), addDefaults);
addValue(mapToAddTo, Option.SUB_RECEPTOR_ZOOM_LEVEL, options.getSubReceptorZoomLevel(), addDefaults);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,9 @@ void testNonDefaultOptions() {
cso.getRblCalculationOptions().setMonitorSrm2Year(2023);

final Map<String, String> result = OptionsMetadataUtil.optionsToMap(Theme.OWN2000, cso, false);
// is BASIC_OPTIONS + 3 because SplitSubReceptorWorkDistance is by default not set when SplitSubReceptorWork is false
// Also PermitLowerBound options are optional.
assertEquals(BASIC_OPTIONS + 3, result.size(), "Number of options when options are not default");
assertEquals("POLICY", result.get("permit_lower_bound"), "Permit Lower Bound invalid");
assertEquals("123.0", result.get("permit_lower_bound_value"), "Permit Lower Bound valueinvalid");
// is BASIC_OPTIONS + 1 because SplitSubReceptorWorkDistance is by default not set when SplitSubReceptorWork is false
// TODO AER-4028: PermitLowerBound options temporarily not written to GML
assertEquals(BASIC_OPTIONS + 1, result.size(), "Number of options when options are not default");
assertEquals("2020", result.get("meteo_year"), "Invalid meteo year option");
assertEquals("true", result.get("without_source_stacking"), "Invalid without_source_stacking option");
assertEquals("OPS_ROAD", result.get("ops_road"), "Invalid ops_road option");
Expand Down