-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
AER-2858 description when farm lodging could not be converted
Instead of an empty description, the description should now contain the main codes used in the old lodging definition. Only the main one, not any of the additional stuff, that would just get messy.
- Loading branch information
1 parent
15db5e2
commit be4e595
Showing
4 changed files
with
185 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
source/imaer-gml/src/test/resources/gml/v5_1/roundtrip/farm_no_conversion.gml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
<?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/5.1" gml:id="NL.IMAER.Collection" xsi:schemaLocation="http://imaer.aerius.nl/5.1 https://imaer.aerius.nl/5.1/IMAER.xsd"> | ||
<imaer:metadata> | ||
<imaer:AeriusCalculatorMetadata> | ||
<imaer:project> | ||
<imaer:ProjectMetadata> | ||
<imaer:year>2013</imaer:year> | ||
<imaer:name>Situatie 1</imaer:name> | ||
</imaer:ProjectMetadata> | ||
</imaer:project> | ||
<imaer:situation> | ||
<imaer:SituationMetadata> | ||
<imaer:name>Situatie 1</imaer:name> | ||
<imaer:reference>RpXpU4DVH2Nw</imaer:reference> | ||
<imaer:situationType>PROPOSED</imaer:situationType> | ||
</imaer:SituationMetadata> | ||
</imaer:situation> | ||
<imaer:version> | ||
<imaer:VersionMetadata> | ||
<imaer:aeriusVersion>DEV</imaer:aeriusVersion> | ||
<imaer:databaseVersion>BETA8_20140904_7fbba21b46</imaer:databaseVersion> | ||
</imaer:VersionMetadata> | ||
</imaer:version> | ||
</imaer:AeriusCalculatorMetadata> | ||
</imaer:metadata> | ||
<imaer:featureMember> | ||
<imaer:FarmLodgingEmissionSource sectorId="4110" gml:id="ES.6"> | ||
<imaer:identifier> | ||
<imaer:NEN3610ID> | ||
<imaer:namespace>NL.IMAER</imaer:namespace> | ||
<imaer:localId>ES.6</imaer:localId> | ||
</imaer:NEN3610ID> | ||
</imaer:identifier> | ||
<imaer:label>Boerderij</imaer:label> | ||
<imaer:emissionSourceCharacteristics> | ||
<imaer:EmissionSourceCharacteristics> | ||
<imaer:heatContent> | ||
<imaer:SpecifiedHeatContent> | ||
<imaer:value>0.0</imaer:value> | ||
</imaer:SpecifiedHeatContent> | ||
</imaer:heatContent> | ||
<imaer:emissionHeight>5.0</imaer:emissionHeight> | ||
</imaer:EmissionSourceCharacteristics> | ||
</imaer:emissionSourceCharacteristics> | ||
<imaer:geometry> | ||
<imaer:EmissionSourceGeometry> | ||
<imaer:GM_Point> | ||
<gml:Point srsName="urn:ogc:def:crs:EPSG::28992" gml:id="ES.6.POINT"> | ||
<gml:pos>69462.46 443548.56</gml:pos> | ||
</gml:Point> | ||
</imaer:GM_Point> | ||
</imaer:EmissionSourceGeometry> | ||
</imaer:geometry> | ||
<imaer:emission> | ||
<imaer:Emission substance="NH3"> | ||
<imaer:value>2149.0</imaer:value> | ||
</imaer:Emission> | ||
</imaer:emission> | ||
<imaer:emission> | ||
<imaer:Emission substance="NOX"> | ||
<imaer:value>0.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:farmLodging> | ||
<imaer:StandardFarmLodging farmLodgingType="X9.8"> | ||
<imaer:numberOfAnimals>100</imaer:numberOfAnimals> | ||
<imaer:farmLodgingSystemDefinitionType>LWB1999.0.1</imaer:farmLodgingSystemDefinitionType> | ||
</imaer:StandardFarmLodging> | ||
</imaer:farmLodging> | ||
</imaer:FarmLodgingEmissionSource> | ||
</imaer:featureMember> | ||
</imaer:FeatureCollectionCalculator> |
88 changes: 88 additions & 0 deletions
88
source/imaer-gml/src/test/resources/gml/v6_0/roundtrip/farm_no_conversion.gml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
<?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>2013</imaer:year> | ||
<imaer:name>Situatie 1</imaer:name> | ||
</imaer:ProjectMetadata> | ||
</imaer:project> | ||
<imaer:situation> | ||
<imaer:SituationMetadata> | ||
<imaer:name>Situatie 1</imaer:name> | ||
<imaer:reference>RpXpU4DVH2Nw</imaer:reference> | ||
<imaer:situationType>PROPOSED</imaer:situationType> | ||
</imaer:SituationMetadata> | ||
</imaer:situation> | ||
<imaer:version> | ||
<imaer:VersionMetadata> | ||
<imaer:aeriusVersion>DEV</imaer:aeriusVersion> | ||
<imaer:databaseVersion>BETA8_20140904_7fbba21b46</imaer:databaseVersion> | ||
</imaer:VersionMetadata> | ||
</imaer:version> | ||
</imaer:AeriusCalculatorMetadata> | ||
</imaer:metadata> | ||
<imaer:featureMember> | ||
<imaer:FarmAnimalHousingSource sectorId="4110" gml:id="ES.6"> | ||
<imaer:identifier> | ||
<imaer:NEN3610ID> | ||
<imaer:namespace>NL.IMAER</imaer:namespace> | ||
<imaer:localId>ES.6</imaer:localId> | ||
</imaer:NEN3610ID> | ||
</imaer:identifier> | ||
<imaer:label>Boerderij</imaer:label> | ||
<imaer:emissionSourceCharacteristics> | ||
<imaer:EmissionSourceCharacteristics> | ||
<imaer:heatContent> | ||
<imaer:SpecifiedHeatContent> | ||
<imaer:value>0.0</imaer:value> | ||
</imaer:SpecifiedHeatContent> | ||
</imaer:heatContent> | ||
<imaer:emissionHeight>5.0</imaer:emissionHeight> | ||
</imaer:EmissionSourceCharacteristics> | ||
</imaer:emissionSourceCharacteristics> | ||
<imaer:geometry> | ||
<imaer:EmissionSourceGeometry> | ||
<imaer:GM_Point> | ||
<gml:Point srsName="urn:ogc:def:crs:EPSG::28992" gml:id="ES.6.POINT"> | ||
<gml:pos>69462.46 443548.56</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>0.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:animalHousing> | ||
<imaer:CustomFarmAnimalHousing animalType="X"> | ||
<imaer:numberOfAnimals>100</imaer:numberOfAnimals> | ||
<imaer:description>X9.8, LWB1999.0.1</imaer:description> | ||
<imaer:emissionFactor> | ||
<imaer:Emission substance="NH3"> | ||
<imaer:value>0.0</imaer:value> | ||
</imaer:Emission> | ||
</imaer:emissionFactor> | ||
<imaer:emissionFactorType>PER_ANIMAL_PER_YEAR</imaer:emissionFactorType> | ||
</imaer:CustomFarmAnimalHousing> | ||
</imaer:animalHousing> | ||
</imaer:FarmAnimalHousingSource> | ||
</imaer:featureMember> | ||
</imaer:FeatureCollectionCalculator> |