Mercurial > dive4elements > river
changeset 7276:c9d448b959ac
Revert 7273, add undefined macro to meta-data.xml.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 10 Oct 2013 09:49:01 +0200 |
| parents | d6fd88ff553b |
| children | 0ba4c4fbd410 |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Oct 09 17:56:39 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Thu Oct 10 09:49:01 2013 +0200 @@ -159,6 +159,7 @@ </dc:when> <dc:when test="$out = 'discharge_curve'"> <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="basedata_1_additionals_wq"/> <dc:call-macro name="basedata_5_flood-protections"/> <computed_discharge_curve> <dc:call-macro name="mainvalues"/> @@ -246,8 +247,9 @@ </dc:when> <dc:when test="$out = 'computed_discharge_curve'"> <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="basedata_0_wq"/> + <dc:call-macro name="basedata_1_additionals_wq"/> <dc:call-macro name="basedata_5_flood-protections"/> - <dc:call-macro name="basedata_0_wq"/> <computed_discharge_curve> <dc:call-macro name="mainvalues"/> </computed_discharge_curve> @@ -1778,6 +1780,15 @@ </dc:call-macro> </dc:macro> + <dc:macro name="basedata_1_additionals_wq"> + <dc:call-macro name="basedata_1_additionals_macro"> + <column name="{$wst_column_name}" + ids="base_data-wstv-{$wst_column_position}-{$wst_id}" + factory="wqinterpol" target_out="{$out}" + info="{$info} [km {$deffrom} - {$defto}]"/> + </dc:call-macro> + </dc:macro> + <!-- Floodmap part --> <dc:macro name="flood-map-complete"> <dc:call-macro name="flood-map-buildings"/>