Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8587:07c9ac22f611
(issue1755) Generalise BedQuality result handling
The bedquality calculation now produces a result for each time period
which has BedQualityResultValues for each specific result type.
Formally this was split up in density, porosity and diameter classes
with some bedload diameter classes mixed in for extra fun.
The intent of this commit is to allow more shared code and generic
access patterns to the BedQuality results.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 18 Mar 2015 18:42:08 +0100 |
| parents | 17a3030bbda2 |
| children | 36faef4f8acb |
comparison
equal
deleted
inserted
replaced
| 8586:19fde13e2db4 | 8587:07c9ac22f611 |
|---|---|
| 828 </dc:filter> | 828 </dc:filter> |
| 829 </dc:macro> | 829 </dc:macro> |
| 830 | 830 |
| 831 <dc:macro name="bedquality"> | 831 <dc:macro name="bedquality"> |
| 832 <dc:filter expr="$out_name = 'bed_longitudinal_section' and | 832 <dc:filter expr="$out_name = 'bed_longitudinal_section' and |
| 833 ($facet_name = 'bed_longitudinal_section.bed_diameter_toplayer' or | 833 ($facet_name = 'bed_longitudinal_section.diameter.toplayer' or |
| 834 $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer' or | 834 $facet_name = 'bed_longitudinal_section.diameter.sublayer' or |
| 835 $facet_name = 'bed_longitudinal_section.bedload_diameter' or | 835 $facet_name = 'bed_longitudinal_section.diameter.bedload' or |
| 836 $facet_name = 'bed_longitudinal_section.sediment_density_toplayer' or | 836 $facet_name = 'bed_longitudinal_section.density.toplayer' or |
| 837 $facet_name = 'bed_longitudinal_section.sediment_density_sublayer' or | 837 $facet_name = 'bed_longitudinal_section.density.sublayer' or |
| 838 $facet_name = 'bed_longitudinal_section.porosity_toplayer' or | 838 $facet_name = 'bed_longitudinal_section.porosity.toplayer' or |
| 839 $facet_name = 'bed_longitudinal_section.porosity_sublayer')"> | 839 $facet_name = 'bed_longitudinal_section.porosity.toplayer')"> |
| 840 <dc:if test="dc:has-result()"> | 840 <dc:if test="dc:has-result()"> |
| 841 <bed_quality> | 841 <bed_quality> |
| 842 <dc:call-macro name="collection-group"> | 842 <dc:call-macro name="collection-group"> |
| 843 <quality-bed description="{dc:group-key()}"> | 843 <quality-bed description="{dc:group-key()}"> |
| 844 <dc:for-each> | 844 <dc:for-each> |