Skip to content
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

AER-3268 development pressure sources #306

Merged
merged 4 commits into from
Oct 31, 2024
Merged

AER-3268 development pressure sources #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a923623
AER-3268 Cleanup before adding new property
BertScholten Oct 31, 2024
bc0c47a
Renamed some non-adms metadata fields
BertScholten Oct 31, 2024
d2b00ee
Adding development pressure source IDs to NCACalculationOptions
BertScholten Oct 31, 2024
989f906
Review comment: updating serial version UID after changes
BertScholten Oct 31, 2024
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
6 changes: 3 additions & 3 deletions ...ce/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLCalculationSetOptionsReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ void testReadCalculationSetOptionsDuplicateOptions() {
when(metaData.getCalculation()).thenReturn(calculationMetaData);

final List<IsGmlProperty<IsCalculationOption>> suppliedOptions = new ArrayList<>();
suppliedOptions.add(mockCalculationOption("adms_permit_area", "somewhere"));
suppliedOptions.add(mockCalculationOption("adms_permit_area", "somewhere else"));
suppliedOptions.add(mockCalculationOption("permit_area", "somewhere"));
suppliedOptions.add(mockCalculationOption("permit_area", "somewhere else"));
when(calculationMetaData.getOptions()).thenAnswer(a -> suppliedOptions);

final GMLCalculationSetOptionsReader reader = new GMLCalculationSetOptionsReader(featureCollection);
Expand All @@ -191,7 +191,7 @@ void testNCAReadCalculationSetOptions(final Boolean spatiallyVaryingRoughness) {
when(metaData.getCalculation()).thenReturn(calculationMetaData);

final List<IsGmlProperty<IsCalculationOption>> suppliedOptions = new ArrayList<>();
suppliedOptions.add(mockCalculationOption("adms_permit_area", "somewhere"));
suppliedOptions.add(mockCalculationOption("permit_area", "somewhere"));
suppliedOptions.add(mockCalculationOption("adms_meteo_site_location", "some meteo loc"));
suppliedOptions.add(mockCalculationOption("adms_meteo_years", "2040,2042"));
suppliedOptions.add(mockCalculationOption("adms_min_monin_obukhov_length", "3.4"));
Expand Down
1 change: 1 addition & 0 deletions source/imaer-gml/src/test/java/nl/overheid/aerius/gml/GMLRoundtripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class GMLRoundtripTest {
{"nca_calculation_options", CharacteristicsType.ADMS},
{"nca_calculation_options_quick_run", CharacteristicsType.ADMS},
{"nca_calculation_options_multi_met_years", CharacteristicsType.ADMS},
{"nca_calculation_options_decision_framework", CharacteristicsType.ADMS},
{"archive_metadata", CharacteristicsType.ADMS},
{"archive_metadata_extended", CharacteristicsType.ADMS},
{"farm_animal_housing", CharacteristicsType.OPS},
Expand Down
332 changes: 332 additions & 0 deletions ...-gml/src/test/resources/gml/v6_0/roundtrip/nca_calculation_options_decision_framework.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<imaer:FeatureCollectionCalculator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:imaer="http://imaer.aerius.nl/6.0" gml:id="NL.IMAER.Collection" xsi:schemaLocation="http://imaer.aerius.nl/6.0 https://imaer.aerius.nl/6.0/IMAER.xsd">
<imaer:metadata>
<imaer:AeriusCalculatorMetadata>
<imaer:project>
<imaer:ProjectMetadata>
<imaer:year>2023</imaer:year>
<imaer:name>Existing enterprise</imaer:name>
</imaer:ProjectMetadata>
</imaer:project>
<imaer:situation>
<imaer:SituationMetadata>
<imaer:name>Existing enterprise</imaer:name>
<imaer:reference>S4R2JDFikdcM</imaer:reference>
<imaer:situationType>PROPOSED</imaer:situationType>
</imaer:SituationMetadata>
</imaer:situation>
<imaer:calculation>
<imaer:CalculationMetadata>
<imaer:method>FORMAL_ASSESSMENT</imaer:method>
<imaer:jobType>MAX_TEMPORARY_EFFECT</imaer:jobType>
<imaer:substance>NOX</imaer:substance>
<imaer:substance>NO2</imaer:substance>
<imaer:substance>NH3</imaer:substance>
<imaer:resultType>CONCENTRATION</imaer:resultType>
<imaer:resultType>DEPOSITION</imaer:resultType>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>project_category</imaer:key>
<imaer:value>GO_KARTING</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>permit_area</imaer:key>
<imaer:value>CARDIFF</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>development_pressure_source_ids</imaer:key>
<imaer:value>ES.1,ES.3</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>road_local_fraction_no2_receptors_option</imaer:key>
<imaer:value>ONE_CUSTOM_VALUE</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>road_local_fraction_no2_points_option</imaer:key>
<imaer:value>ONE_CUSTOM_VALUE</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>road_local_fraction_no2_custom_value</imaer:key>
<imaer:value>0.532</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_min_monin_obukhov_length</imaer:key>
<imaer:value>30.0</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_surface_albedo</imaer:key>
<imaer:value>0.23</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_priestley_taylor_parameter</imaer:key>
<imaer:value>1.0</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_met_site_id</imaer:key>
<imaer:value>33340</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_met_site_roughness</imaer:key>
<imaer:value>0.075450025</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_met_site_min_monin_obukhov_length</imaer:key>
<imaer:value>30.0</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_met_site_surface_albedo</imaer:key>
<imaer:value>0.23907508</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_met_site_priestley_taylor_parameter</imaer:key>
<imaer:value>1.0</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_plume_depletion_nh3</imaer:key>
<imaer:value>true</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_plume_depletion_nox</imaer:key>
<imaer:value>true</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_spatially_varying_roughness</imaer:key>
<imaer:value>true</imaer:value>
</imaer:CalculationOption>
</imaer:option>
<imaer:option>
<imaer:CalculationOption>
<imaer:key>adms_complex_terrain</imaer:key>
<imaer:value>true</imaer:value>
</imaer:CalculationOption>
</imaer:option>
</imaer:CalculationMetadata>
</imaer:calculation>
<imaer:version>
<imaer:VersionMetadata>
<imaer:aeriusVersion>DEV</imaer:aeriusVersion>
<imaer:databaseVersion>BETA2_20130626_d131b24b59</imaer:databaseVersion>
</imaer:VersionMetadata>
</imaer:version>
</imaer:AeriusCalculatorMetadata>
</imaer:metadata>
<imaer:featureMember>
<imaer:EmissionSource sectorId="1400" gml:id="ES.1">
<imaer:identifier>
<imaer:NEN3610ID>
<imaer:namespace>NL.IMAER</imaer:namespace>
<imaer:localId>ES.1</imaer:localId>
</imaer:NEN3610ID>
</imaer:identifier>
<imaer:label>Brick factory</imaer:label>
<imaer:emissionSourceCharacteristics>
<imaer:ADMSSourceCharacteristics>
<imaer:building xlink:href="#Building.1"/>
<imaer:height>35.0</imaer:height>
<imaer:specificHeatCapacity>342.12</imaer:specificHeatCapacity>
<imaer:sourceType>POINT</imaer:sourceType>
<imaer:diameter>4.3</imaer:diameter>
<imaer:buoyancyType>DENSITY</imaer:buoyancyType>
<imaer:density>58.23</imaer:density>
<imaer:effluxType>VELOCITY</imaer:effluxType>
<imaer:verticalVelocity>49.2</imaer:verticalVelocity>
<imaer:hourlyVariation>
<imaer:StandardTimeVaryingProfile>
<imaer:standardType>SOME_TYPE</imaer:standardType>
</imaer:StandardTimeVaryingProfile>
</imaer:hourlyVariation>
</imaer:ADMSSourceCharacteristics>
</imaer:emissionSourceCharacteristics>
<imaer:geometry>
<imaer:EmissionSourceGeometry>
<imaer:GM_Point>
<gml:Point srsName="urn:ogc:def:crs:EPSG::28992" gml:id="ES.1.POINT">
<gml:pos>184080.38 430602.3</gml:pos>
</gml:Point>
</imaer:GM_Point>
</imaer:EmissionSourceGeometry>
</imaer:geometry>
<imaer:emission>
<imaer:Emission substance="NH3">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NOX">
<imaer:value>20000.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="PM10">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NO2">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
</imaer:EmissionSource>
</imaer:featureMember>
<imaer:featureMember>
<imaer:EmissionSource sectorId="1400" gml:id="ES.2">
<imaer:identifier>
<imaer:NEN3610ID>
<imaer:namespace>NL.IMAER</imaer:namespace>
<imaer:localId>ES.2</imaer:localId>
</imaer:NEN3610ID>
</imaer:identifier>
<imaer:label>Second source</imaer:label>
<imaer:emissionSourceCharacteristics>
<imaer:ADMSSourceCharacteristics>
<imaer:height>35.0</imaer:height>
<imaer:specificHeatCapacity>342.12</imaer:specificHeatCapacity>
<imaer:sourceType>POINT</imaer:sourceType>
<imaer:diameter>4.3</imaer:diameter>
<imaer:buoyancyType>DENSITY</imaer:buoyancyType>
<imaer:density>58.23</imaer:density>
<imaer:effluxType>VELOCITY</imaer:effluxType>
<imaer:verticalVelocity>49.2</imaer:verticalVelocity>
</imaer:ADMSSourceCharacteristics>
</imaer:emissionSourceCharacteristics>
<imaer:geometry>
<imaer:EmissionSourceGeometry>
<imaer:GM_Point>
<gml:Point srsName="urn:ogc:def:crs:EPSG::28992" gml:id="ES.2.POINT">
<gml:pos>185080.38 431602.3</gml:pos>
</gml:Point>
</imaer:GM_Point>
</imaer:EmissionSourceGeometry>
</imaer:geometry>
<imaer:emission>
<imaer:Emission substance="NH3">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NOX">
<imaer:value>4000.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="PM10">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NO2">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
</imaer:EmissionSource>
</imaer:featureMember>
<imaer:featureMember>
<imaer:EmissionSource sectorId="1400" gml:id="ES.3">
<imaer:identifier>
<imaer:NEN3610ID>
<imaer:namespace>NL.IMAER</imaer:namespace>
<imaer:localId>ES.3</imaer:localId>
</imaer:NEN3610ID>
</imaer:identifier>
<imaer:label>Third source</imaer:label>
<imaer:emissionSourceCharacteristics>
<imaer:ADMSSourceCharacteristics>
<imaer:height>35.0</imaer:height>
<imaer:specificHeatCapacity>342.12</imaer:specificHeatCapacity>
<imaer:sourceType>POINT</imaer:sourceType>
<imaer:diameter>4.3</imaer:diameter>
<imaer:buoyancyType>DENSITY</imaer:buoyancyType>
<imaer:density>58.23</imaer:density>
<imaer:effluxType>VELOCITY</imaer:effluxType>
<imaer:verticalVelocity>49.2</imaer:verticalVelocity>
</imaer:ADMSSourceCharacteristics>
</imaer:emissionSourceCharacteristics>
<imaer:geometry>
<imaer:EmissionSourceGeometry>
<imaer:GM_Point>
<gml:Point srsName="urn:ogc:def:crs:EPSG::28992" gml:id="ES.3.POINT">
<gml:pos>184090.38 430601.3</gml:pos>
</gml:Point>
</imaer:GM_Point>
</imaer:EmissionSourceGeometry>
</imaer:geometry>
<imaer:emission>
<imaer:Emission substance="NH3">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NOX">
<imaer:value>5000.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="PM10">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
<imaer:emission>
<imaer:Emission substance="NO2">
<imaer:value>0.0</imaer:value>
</imaer:Emission>
</imaer:emission>
</imaer:EmissionSource>
</imaer:featureMember>
<imaer:featureMember>
<imaer:Building gml:id="Building.1">
<imaer:identifier>
<imaer:NEN3610ID>
<imaer:namespace>NL.IMAER</imaer:namespace>
<imaer:localId>Building.1</imaer:localId>
</imaer:NEN3610ID>
</imaer:identifier>
<imaer:label>Building 1</imaer:label>
<imaer:height>9.2</imaer:height>
<imaer:geometry>
<imaer:BuildingGeometry>
<imaer:GM_Surface>
<gml:Polygon srsName="urn:ogc:def:crs:EPSG::28992" gml:id="Building.1.SURFACE">
<gml:exterior>
<gml:LinearRing>
<gml:posList>184099.3539485522 430576.7455135771 184110.88283492287 430593.2104696673 184061.40605144782 430627.8544864229 184049.87716507714 430611.3895303327 184099.3539485522 430576.7455135771</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
</imaer:GM_Surface>
</imaer:BuildingGeometry>
</imaer:geometry>
</imaer:Building>
</imaer:featureMember>
</imaer:FeatureCollectionCalculator>
Loading
Loading