Mercurial > dive4elements > river
diff flys-artifacts/doc/conf/meta-data.xml @ 5477:ae60bb7b8085
Add proper handling of multiple river_axes for datacage and rivermapfile
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 27 Mar 2013 18:31:31 +0100 |
| parents | 3e9bf93dc95c |
| children | 23d8f2700b38 |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml Wed Mar 27 17:49:46 2013 +0100 +++ b/flys-artifacts/doc/conf/meta-data.xml Wed Mar 27 18:31:31 2013 +0100 @@ -1195,6 +1195,49 @@ </dc:if> </dc:context> </dc:macro> + <dc:macro name="flood-map-riveraxis"> + <dc:context> + <dc:statement> + SELECT DISTINCT + ax.kind_id as kind_id, + ak.name as kind_name + FROM river_axes ax + JOIN axis_kinds ak on ax.kind_id = ak.id + WHERE river_id = ${river_id} + AND kind_id=1 + </dc:statement> + <dc:if test="dc:has-result()"> + <dc:elements> + <actual factory="riveraxis"> + <dc:attribute name="description" value="${kind_name}"/> + <dc:attribute name="ids" value="${river_id};${kind_name};${kind_id}"/> + </actual> + </dc:elements> + </dc:if> + </dc:context> + <dc:context> + <dc:statement> + SELECT DISTINCT + ak.name as kind_name, + ax.kind_id as kind_id, + ax.name as layer_name + FROM river_axes ax + JOIN axis_kinds ak on ax.kind_id = ak.id + WHERE river_id = ${river_id} + AND kind_id <> 1 + </dc:statement> + <dc:if test="dc:has-result()"> + <other> + <dc:elements> + <misc-axis factory="riveraxis"> + <dc:attribute name="description" value="${layer_name}"/> + <dc:attribute name="ids" value="${river_id};${layer_name};${kind_id}"/> + </misc-axis> + </dc:elements> + </other> + </dc:if> + </dc:context> + </dc:macro> <dc:macro name="flood-map-hydr-boundaries"> <hydr_boundaries_lines> <dc:call-macro name="flood-map-hydr-boundaries-lines"/> @@ -1745,10 +1788,9 @@ </qps> <dc:call-macro name="flood-map-fixpoints"/> <dc:call-macro name="flood-map-km"/> - <riveraxis> - <dc:attribute name="factory" value="riveraxis"/> - <dc:attribute name="ids" value="${river_id}"/> - </riveraxis> + <axis> + <dc:call-macro name="flood-map-riveraxis"/> + </axis> </dc:macro> <dc:macro name="flood-map-complete">