Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 4123:30168be950a6
Improvements on issue934/4 (double annotations/DC).
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 12 Oct 2012 20:21:44 +0200 |
| parents | 0b0192727265 |
| children | c03639e30cc5 |
comparison
equal
deleted
inserted
replaced
| 4122:0b0192727265 | 4123:30168be950a6 |
|---|---|
| 674 <dc:call-macro name="basedata_3_officials"/> | 674 <dc:call-macro name="basedata_3_officials"/> |
| 675 <dc:call-macro name="basedata_5_flood-protections"/> | 675 <dc:call-macro name="basedata_5_flood-protections"/> |
| 676 <dc:call-macro name="annotations_per_type"/> | 676 <dc:call-macro name="annotations_per_type"/> |
| 677 </dc:if> | 677 </dc:if> |
| 678 | 678 |
| 679 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> | 679 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> |
| 680 | 680 <dc:call-macro name="annotations"/> |
| 681 <longitudinal_section> | 681 <!--dc:call-macro name="basedata_0"/--> |
| 682 <dc:call-macro name="annotations"/> | 682 <dc:call-macro name="basedata_1_additionals-relative_point"/> |
| 683 </longitudinal_section> | 683 <dc:comment comment=" FIXATIONS ---------------------------"/> |
| 684 </dc:if> | 684 <dc:call-macro name="basedata_2_fixations_relative_point"/> |
| 685 | 685 <dc:comment comment=" HOEHENMARKEN ---------------------------"/> |
| 686 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> | 686 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> |
| 687 <dc:call-macro name="annotations"/> | 687 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> |
| 688 <!--dc:call-macro name="basedata_0"/--> | 688 </dc:if> |
| 689 <dc:call-macro name="basedata_1_additionals-relative_point"/> | 689 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> |
| 690 <dc:comment comment=" FIXATIONS ---------------------------"/> | 690 <dc:call-macro name="basedata_0_wq"/> |
| 691 <dc:call-macro name="basedata_2_fixations_relative_point"/> | 691 <dc:call-macro name="basedata_1_additionals"/> |
| 692 <dc:comment comment=" HOEHENMARKEN ---------------------------"/> | 692 <dc:call-macro name="basedata_2_fixations_wqkms"/> |
| 693 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> | 693 <dc:call-macro name="basedata_3_officials"/> |
| 694 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> | 694 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 695 </dc:if> | 695 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> |
| 696 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> | 696 </dc:if> |
| 697 <dc:call-macro name="basedata_0_wq"/> | 697 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> |
| 698 <dc:call-macro name="basedata_1_additionals"/> | 698 </dc:if> |
| 699 <dc:call-macro name="basedata_2_fixations"/> | 699 <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> |
| 700 <dc:call-macro name="basedata_3_officials"/> | 700 <dc:call-macro name="annotations"/> |
| 701 <dc:call-macro name="basedata_4_heightmarks-points"/> | 701 </dc:if> |
| 702 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> | |
| 703 </dc:if> | |
| 704 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> | |
| 705 </dc:if> | |
| 706 <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> | |
| 707 <dc:call-macro name="annotations"/> | |
| 708 </dc:if> | |
| 709 <dc:comment comment="--- non-recommendations---"/> | 702 <dc:comment comment="--- non-recommendations---"/> |
| 710 </dc:otherwise> | 703 </dc:otherwise> |
| 711 </dc:choose> | 704 </dc:choose> |
| 712 | 705 |
| 713 | 706 |