Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 9117:623b51bf03d7
Added datacage select and chart display for river bed collision counts loaded from database
author | mschaefer |
---|---|
date | Mon, 04 Jun 2018 17:31:51 +0200 |
parents | edc3958b3ed2 |
children | dbb26bc81843 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Mon Jun 04 12:50:39 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Jun 04 17:31:51 2018 +0200 @@ -1614,6 +1614,10 @@ <dc:call-macro name="sinfo_predefined_flowdepth-m"/> </sinfo_predefined_flowdepths> + <sinfo_collisions> + <dc:call-macro name="sinfo_collisions"/> + </sinfo_collisions> + <sinfo_predefined_channel> <dc:call-macro name="sinfo_predefined_channel"/> </sinfo_predefined_channel> @@ -3579,5 +3583,27 @@ </dc:context> </dc:macro> + <!-- collisions imported from CSV-files for S-INFO --> + <dc:macro name="sinfo_collisions"> + <dc:context> + <dc:statement> + SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, MIN(s.year) AS year, + MIN(s.filename) || '<br />' + || MIN(s.kmrange_info) || '<br />' + || MIN(s.year) || '<br />' AS info + FROM collision s INNER JOIN collision_values v ON s.id=v.collision_id + WHERE (s.river_id=${river_id}) + AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) + GROUP BY s.id + ORDER BY MIN(s.year) ASC; + </dc:statement> + <dc:if test="dc:has-result()"> + <dc:for-each> + <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{${$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/> + </dc:for-each> + </dc:if> + </dc:context> + </dc:macro> + </datacage> </dc:template> \ No newline at end of file