Mercurial > dive4elements > river
changeset 2140:3d73109005b8
Recommend hyks if hit by cross section out.
flys-artifacts/trunk@3718 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 19 Jan 2012 12:59:36 +0000 |
| parents | 923256599afe |
| children | 79a94c4171cb |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Jan 19 12:52:44 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jan 19 12:59:36 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/meta-data.xml: Recommend hyks for current river if hit by + a crosssection-out. + 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> Somewhat improved HYK handling and rendering.
--- a/flys-artifacts/doc/conf/meta-data.xml Thu Jan 19 12:52:44 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Thu Jan 19 12:59:36 2012 +0000 @@ -335,6 +335,25 @@ </cross-sections> </dc:macro> + <dc:macro name="hyks"> + <hyks> + <dc:attribute name="id" value="hyk-${river_id}"/> + <dc:context> + <dc:statement> + SELECT id AS hyk_id, + description AS hyk_description + FROM hyks WHERE river_id = ${river_id} + </dc:statement> + <dc:elements> + <hyk> + <dc:attribute name="name" value="${hyk_description}"/> + <dc:attribute name="ids" value="${hyk_id}"/> + <dc:attribute name="factory" value="hyk"/> + </hyk> + </dc:elements> + </dc:context> + </hyks> + </dc:macro> <dc:comment> @@ -355,6 +374,7 @@ </dc:if> <dc:if test="dc:contains($artifact-outs, 'cross_section')"> <dc:call-macro name="cross_sections"/> + <dc:call-macro name="hyks"/> </dc:if> </dc:when> <dc:otherwise>