Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 6518:1a7f5d09b9d8
Longitudinal sections: partly renamed outs and configured recommendations at once
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 28 Jun 2013 21:08:23 +0200 |
| parents | d1d503584d34 |
| children | f4872350b50f dd5355775ce1 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:05:52 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:08:23 2013 +0200 @@ -45,10 +45,7 @@ </dc:comment> <dc:iterate var="out" container="artifact-outs"> <dc:choose> - <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="annotations"/> - </dc:when> - <dc:when test="$out = 'discharge_longitudinal_section'"> + <dc:when test="dc:contains($out, 'longitudinal_section')"> <dc:call-macro name="annotations"/> <dc:call-macro name="officiallines_user"/> </dc:when> @@ -108,9 +105,6 @@ <dc:call-macro name="bed-heights-epoch"/> </bedheights> </dc:when> - <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="annotations"/> - </dc:when> </dc:choose> </dc:iterate> </dc:when> @@ -133,7 +127,7 @@ <dc:when test="$out = 'longitudinal_section'"> <dc:call-macro name="longitudinal-section-prototype"/> </dc:when> - <dc:when test="$out = 'w_differences'"> + <dc:when test="$out = 'w_differences_longitudinal_section'"> <dc:call-macro name="longitudinal-section-prototype"/> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> @@ -172,18 +166,18 @@ <dc:when test="$out = 'map'"> <dc:call-macro name="flood-map-complete"/> </dc:when> - <dc:when test="$out = 'flow_velocity'"> + <dc:when test="$out = 'flow_velocity_longitudinal_section'"> <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="flow_velocity_measurements"/> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> <dc:call-macro name="annotations_per_type"/> </dc:when> - <dc:when test="$out = 'sedimentload_ls'"> + <dc:when test="$out = 'sedimentload_longitudinal_section'"> <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bedheight_middle'"> + <dc:when test="$out = 'bedheight_middle_longitudinal_section'"> <dc:call-macro name="sounding-width"/> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> @@ -191,7 +185,7 @@ <dc:call-macro name="basedata_3_officials"/> <dc:call-macro name="annotations_per_type"/> </dc:when> - <dc:when test="$out = 'bed_difference_height_year'"> + <dc:when test="$out = 'bed_difference_height_year_longitudinal_section'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -200,7 +194,7 @@ <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bed_difference_year'"> + <dc:when test="$out = 'bed_difference_year_longitudinal_section'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -209,7 +203,7 @@ <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bed_difference_epoch'"> + <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -316,7 +310,7 @@ <dc:call-macro name="longitudinal"/> <dc:call-macro name="differences"/> </dc:when> - <dc:when test="$out = 'w_differences'"> + <dc:when test="$out = 'w_differences_longitudinal_section'"> <dc:call-macro name="longitudinal"/> <dc:call-macro name="differences"/> </dc:when> @@ -356,14 +350,14 @@ <dc:when test="$out = 'map'"> <dc:call-macro name="flood-map"/> </dc:when> - <dc:when test="$out = 'bedheight_middle'"> + <dc:when test="$out = 'bedheight_middle_longitudinal_section'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="waterlevels-fix"/> </dc:when> <dc:when test="$out = 'floodmap-hws'"> <dc:call-macro name="floodmap-hws-user"/> </dc:when> - <dc:when test="$out = 'flow_velocity'"> + <dc:when test="$out = 'flow_velocity_longitudinal_section'"> <dc:call-macro name="bedquality-bed"/> <dc:call-macro name="bedquality-load"/> </dc:when> @@ -373,20 +367,20 @@ <dc:call-macro name="bedquality-density"/> <dc:call-macro name="bedquality-porosity"/> </dc:when> - <dc:when test="$out = 'sedimentload_ls'"> + <dc:when test="$out = 'sedimentload_longitudinal_section'"> <dc:call-macro name="differences"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="flow-velocity"/> <dc:call-macro name="sediment-load"/> </dc:when> - <dc:when test="$out = 'bed_difference_year'"> + <dc:when test="$out = 'bed_difference_year_longitudinal_section'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="differences"/> <dc:call-macro name="waterlevels-fix"/> <dc:call-macro name="delta-wt-ls"/> </dc:when> - <dc:when test="$out = 'bed_difference_epoch'"> + <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="differences"/> @@ -414,7 +408,7 @@ factory="winfo" target_out="{$out}" artifact-id="{$aid}" ids="{$aid}" - out="w_differences"/> + out="w_differences_longitudinal_section"/> </dc:for-each> </differences> </dc:if> @@ -828,7 +822,7 @@ </dc:macro> <dc:macro name="flow-velocity"> - <dc:filter expr="$out_name = 'flow_velocity' and + <dc:filter expr="$out_name = 'flow_velocity_longitudinal_section' and ($facet_name = 'flow_velocity.totalchannel' or $facet_name = 'flow_velocity.mainchannel' or $facet_name = 'flow_velocity.totalchannel.filtered' or @@ -844,7 +838,7 @@ <dc:attribute name="description" value="${facet_description}"/> <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="out" value="flow_velocity"/> + <dc:attribute name="out" value="flow_velocity_longitudinal_section"/> </dc:element> </dc:for-each> </flow> @@ -855,7 +849,7 @@ </dc:macro> <dc:macro name="sediment-load"> - <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')"> + <dc:filter expr="$out_name = 'sedimentload_longitudinal_section' and starts-with($facet_name, 'sedimentload')"> <dc:if test="dc:has-result()"> <sediment-load> <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> @@ -867,7 +861,7 @@ <dc:attribute name="description" value="${facet_description}"/> <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="out" value="sedimentload_ls"/> + <dc:attribute name="out" value="sedimentload_longitudinal_section"/> </dc:element> </dc:for-each> </load> @@ -878,7 +872,7 @@ </dc:macro> <dc:macro name="bedheight-differences"> - <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and + <dc:filter expr="($out_name = 'bed_difference_year_longitudinal_section' or $out_name = 'bed_difference_epoch_longitudinal_section') and (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))"> <dc:if test="dc:has-result()"> <bedheight-differences>