Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 4432:e8a4d2fd25cc
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 07 Nov 2012 09:47:44 +0100 |
| parents | 44804250b734 |
| children | 5b8919ef601d 60c728e557f4 |
comparison
equal
deleted
inserted
replaced
| 4431:83fe6eeba83a | 4432:e8a4d2fd25cc |
|---|---|
| 664 </dc:if> | 664 </dc:if> |
| 665 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> | 665 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> |
| 666 <dc:call-macro name="mainvalues"/> | 666 <dc:call-macro name="mainvalues"/> |
| 667 </dc:if> | 667 </dc:if> |
| 668 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> | 668 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> |
| 669 <dc:call-macro name="annotations"/> | 669 <!--dc:call-macro name="annotations"/--> |
| 670 <dc:call-macro name="mainvalues"/> | 670 <dc:call-macro name="mainvalues"/> |
| 671 </dc:if> | 671 </dc:if> |
| 672 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> | 672 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> |
| 673 <dc:call-macro name="qsectors"/> | 673 <dc:call-macro name="qsectors"/> |
| 674 </dc:if> | 674 </dc:if> |
| 728 <dc:call-macro name="basedata_5_flood-protections"/> | 728 <dc:call-macro name="basedata_5_flood-protections"/> |
| 729 <dc:call-macro name="annotations_per_type"/> | 729 <dc:call-macro name="annotations_per_type"/> |
| 730 </dc:if> | 730 </dc:if> |
| 731 | 731 |
| 732 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> | 732 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> |
| 733 <dc:call-macro name="annotations"/> | 733 <!--dc:call-macro name="annotations"/-->> |
| 734 <!--dc:call-macro name="basedata_0"/--> | 734 <!--dc:call-macro name="basedata_0"/--> |
| 735 <dc:call-macro name="mainvalues"/> | |
| 735 <dc:call-macro name="basedata_1_additionals-relative_point"/> | 736 <dc:call-macro name="basedata_1_additionals-relative_point"/> |
| 736 <dc:comment comment=" FIXATIONS ---------------------------"/> | 737 <dc:comment comment=" FIXATIONS ---------------------------"/> |
| 737 <dc:call-macro name="basedata_2_fixations_relative_point"/> | 738 <dc:call-macro name="basedata_2_fixations_relative_point"/> |
| 738 <dc:comment comment=" HOEHENMARKEN ---------------------------"/> | 739 <dc:comment comment=" HOEHENMARKEN ---------------------------"/> |
| 739 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> | 740 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> |
| 748 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> | 749 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> |
| 749 </dc:if> | 750 </dc:if> |
| 750 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> | 751 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> |
| 751 </dc:if> | 752 </dc:if> |
| 752 <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> | 753 <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> |
| 754 <dc:call-macro name="annotations"/> | |
| 755 </dc:if> | |
| 756 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> | |
| 753 <dc:call-macro name="annotations"/> | 757 <dc:call-macro name="annotations"/> |
| 754 </dc:if> | 758 </dc:if> |
| 755 <dc:comment comment="--- non-recommendations---"/> | 759 <dc:comment comment="--- non-recommendations---"/> |
| 756 </dc:otherwise> | 760 </dc:otherwise> |
| 757 </dc:choose> | 761 </dc:choose> |