Mercurial > dive4elements > river
changeset 7443:8ce14aeebe61
meta-data.xml: Subsume the different bed-quality dc-nodes.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 25 Oct 2013 14:10:29 +0200 |
| parents | 96938401b1cd |
| children | 97a5f16b976c |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 10 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Oct 25 13:53:48 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Oct 25 14:10:29 2013 +0200 @@ -900,12 +900,17 @@ </dc:filter> </dc:macro> - <dc:macro name="bedquality-bed"> + <dc:macro name="bedquality"> <dc:filter expr="$out_name = 'bed_longitudinal_section' and ($facet_name = 'bed_longitudinal_section.bed_diameter_toplayer' or - $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer')"> + $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer' or + $facet_name = 'bed_longitudinal_section.bedload_diameter' or + $facet_name = 'bed_longitudinal_section.sediment_density_toplayer' or + $facet_name = 'bed_longitudinal_section.sediment_density_sublayer' or + $facet_name = 'bed_longitudinal_section.porosity_toplayer' or + $facet_name = 'bed_longitudinal_section.porosity_sublayer')"> <dc:if test="dc:has-result()"> - <bed_quality_bed> + <bed_quality> <dc:call-macro name="collection-group"> <quality-bed description="{dc:group-key()}"> <dc:for-each> @@ -920,81 +925,7 @@ </dc:for-each> </quality-bed> </dc:call-macro> - </bed_quality_bed> - </dc:if> - </dc:filter> - </dc:macro> - - <dc:macro name="bedquality-load"> - <dc:filter expr="$out_name = 'bed_longitudinal_section' and - $facet_name = 'bed_longitudinal_section.bedload_diameter'"> - <dc:if test="dc:has-result()"> - <bed_quality_load> - <dc:call-macro name="collection-group"> - <quality-load description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="bed_longitudinal_section"/> - </dc:element> - </dc:for-each> - </quality-load> - </dc:call-macro> - </bed_quality_load> - </dc:if> - </dc:filter> - </dc:macro> - - <dc:macro name="bedquality-density"> - <dc:filter expr="$out_name = 'bed_longitudinal_section' and - ($facet_name = 'bed_longitudinal_section.sediment_density_toplayer' or - $facet_name = 'bed_longitudinal_section.sediment_density_sublayer')"> - <dc:if test="dc:has-result()"> - <bed_quality_density> - <dc:call-macro name="collection-group"> - <density description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="bed_longitudinal_section"/> - </dc:element> - </dc:for-each> - </density> - </dc:call-macro> - </bed_quality_density> - </dc:if> - </dc:filter> - </dc:macro> - - <dc:macro name="bedquality-porosity"> - <dc:filter expr="$out_name = 'bed_longitudinal_section' and - ($facet_name = 'bed_longitudinal_section.porosity_toplayer' or - $facet_name = 'bed_longitudinal_section.porosity_sublayer')"> - <dc:if test="dc:has-result()"> - <bed_quality_porosity> - <dc:call-macro name="collection-group"> - <porosity description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="bed_longitudinal_section"/> - </dc:element> - </dc:for-each> - </porosity> - </dc:call-macro> - </bed_quality_porosity> + </bed_quality> </dc:if> </dc:filter> </dc:macro> @@ -1307,12 +1238,9 @@ <dc:call-macro name="longitudinal-section-fix"/> <dc:comment> MINFO </dc:comment> <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="bedquality-bed"/> - <dc:call-macro name="bedquality-load"/> + <dc:call-macro name="bedquality"/> <dc:call-macro name="flow-velocity"/> <dc:call-macro name="sediment-load"/> - <dc:call-macro name="bedquality-density"/> - <dc:call-macro name="bedquality-porosity"/> </dc:macro>