Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 9341:c9a4eb3afa4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Facet filter added for S-Info collision and flood duration, db loaded artifacts renamed to predefined..
author mschaefer
date Mon, 30 Jul 2018 13:40:33 +0200
parents 85d08fb28d96
children c08003a68478
comparison
equal deleted inserted replaced
9340:85d08fb28d96 9341:c9a4eb3afa4a
315 </dc:when> 315 </dc:when>
316 <dc:when test="$out = 'sinfo_flood_duration'"> 316 <dc:when test="$out = 'sinfo_flood_duration'">
317 <dc:call-macro name="longitudinal-section-prototype" /> 317 <dc:call-macro name="longitudinal-section-prototype" />
318 </dc:when> 318 </dc:when>
319 <dc:when test="$out = 'sinfo_flood_height'"> 319 <dc:when test="$out = 'sinfo_flood_height'">
320 <dc:call-macro name="longitudinal-section-prototype" />
321 </dc:when>
322 <!-- FIXME: macht das sinn? die duration_cuve hat ja keine längsschnittdaten -->
323 <dc:when test="$out = 'sinfo_flood_duration_curve'">
324 <dc:call-macro name="longitudinal-section-prototype" /> 320 <dc:call-macro name="longitudinal-section-prototype" />
325 </dc:when> 321 </dc:when>
326 322
327 <dc:when test="$out = 'uinfo_salix_line'"> 323 <dc:when test="$out = 'uinfo_salix_line'">
328 <dc:call-macro name="longitudinal-section-prototype" /> 324 <dc:call-macro name="longitudinal-section-prototype" />
1657 <sinfo> 1653 <sinfo>
1658 <sinfo_predefined_flowdepths> 1654 <sinfo_predefined_flowdepths>
1659 <dc:call-macro name="sinfo_predefined_flowdepth-m" /> 1655 <dc:call-macro name="sinfo_predefined_flowdepth-m" />
1660 </sinfo_predefined_flowdepths> 1656 </sinfo_predefined_flowdepths>
1661 1657
1662 <sinfo_collisions> 1658 <sinfo_predefined_collision>
1663 <dc:call-macro name="sinfo_collisions" /> 1659 <dc:call-macro name="sinfo_predefined_collision" />
1664 </sinfo_collisions> 1660 </sinfo_predefined_collision>
1665 1661
1666 <sinfo_predefined_channel> 1662 <sinfo_predefined_channel>
1667 <dc:call-macro name="sinfo_predefined_channel" /> 1663 <dc:call-macro name="sinfo_predefined_channel" />
1668 </sinfo_predefined_channel> 1664 </sinfo_predefined_channel>
1669 1665
1670 <sinfo_infrastructure> 1666 <sinfo_predefined_infrastructure>
1671 <dc:call-macro name="sinfo_infrastructure" /> 1667 <dc:call-macro name="sinfo_predefined_infrastructure" />
1672 </sinfo_infrastructure> 1668 </sinfo_predefined_infrastructure>
1673 1669
1674 <sinfo_predefined_tkh> 1670 <sinfo_predefined_tkh>
1675 <dc:call-macro name="sinfo_predefined_tkh-berechnung" /> 1671 <dc:call-macro name="sinfo_predefined_tkh-berechnung" />
1676 <dc:call-macro name="sinfo_predefined_tkh-messung" /> 1672 <dc:call-macro name="sinfo_predefined_tkh-messung" />
1677 </sinfo_predefined_tkh> 1673 </sinfo_predefined_tkh>
1704 <dc:call-macro name="middle_bedheights" /> 1700 <dc:call-macro name="middle_bedheights" />
1705 <dc:call-macro name="bedheight_differences" /> 1701 <dc:call-macro name="bedheight_differences" />
1706 <dc:call-macro name="bedquality" /> 1702 <dc:call-macro name="bedquality" />
1707 <dc:call-macro name="flow-velocity" /> 1703 <dc:call-macro name="flow-velocity" />
1708 <dc:call-macro name="sediment-load" /> 1704 <dc:call-macro name="sediment-load" />
1705
1706 <dc:comment> UINFO </dc:comment>
1707 <dc:call-macro name="uinfo_salix_line" />
1709 </dc:macro> 1708 </dc:macro>
1710 1709
1711 <!-- porosities --> 1710 <!-- porosities -->
1712 <dc:macro name="porosities"> 1711 <dc:macro name="porosities">
1713 <porosities> 1712 <porosities>
3326 </dc:otherwise> 3325 </dc:otherwise>
3327 </dc:choose> 3326 </dc:choose>
3328 <dc:macro-body /> 3327 <dc:macro-body />
3329 </dc:macro> 3328 </dc:macro>
3330 3329
3330 <!-- S-INFO -->
3331 <dc:macro name="sinfo_flowdepths"> 3331 <dc:macro name="sinfo_flowdepths">
3332 <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and 3332 <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and
3333 ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or 3333 ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or
3334 $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or 3334 $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or
3335 $facet_name = 'sinfo_facet_tkh' )"> 3335 $facet_name = 'sinfo_facet_tkh' )">
3437 </dc:if> 3437 </dc:if>
3438 </dc:filter> 3438 </dc:filter>
3439 </dc:macro> 3439 </dc:macro>
3440 3440
3441 <dc:macro name="sinfo_collision"> 3441 <dc:macro name="sinfo_collision">
3442 <dc:filter expr="$a_state = 'state.sinfo.collision'"> 3442 <dc:filter expr="$a_state = 'state.sinfo.collision' and ($facet_name = 'sinfo_facet_collision_calc_count'
3443 or $facet_name = 'sinfo_facet_collision_calc_count.2' or $facet_name = 'sinfo_facet_collision_calc_count.3')">
3443 <dc:if test="dc:has-result()"> 3444 <dc:if test="dc:has-result()">
3444 <sinfo_collision> 3445 <sinfo_collision>
3445 <dc:for-each> 3446 <dc:for-each>
3446 <dc:element name="${facet_name}"> 3447 <dc:element name="${facet_name}">
3447 <dc:attribute name="factory" value="sinfo" /> 3448 <dc:attribute name="factory" value="sinfo" />
3456 </dc:if> 3457 </dc:if>
3457 </dc:filter> 3458 </dc:filter>
3458 </dc:macro> 3459 </dc:macro>
3459 3460
3460 <dc:macro name="sinfo_flood_duration"> 3461 <dc:macro name="sinfo_flood_duration">
3461 <dc:filter expr="$a_state = 'state.sinfo.flood_duration'"> 3462 <dc:filter expr="$a_state = 'state.sinfo.flood_duration'
3463 and ($facet_name = 'sinfo_facet_flood_duration.left' or $facet_name = 'sinfo_facet_flood_duration.right'
3464 or $facet_name = 'mainvalue.duration' or $facet_name = 'sinfo_facet_flood_height.left'
3465 or $facet_name = 'sinfo_facet_flood_height.right' or $facet_name = 'mainvalue.w')">
3462 <dc:if test="dc:has-result()"> 3466 <dc:if test="dc:has-result()">
3463 <sinfo_flood_duration> 3467 <sinfo_flood_duration>
3464 <dc:for-each> 3468 <dc:for-each>
3465 <dc:element name="${facet_name}"> 3469 <dc:element name="${facet_name}">
3466 <dc:attribute name="factory" value="sinfo" /> 3470 <dc:attribute name="factory" value="sinfo" />
3618 </dc:if> 3622 </dc:if>
3619 </dc:context> 3623 </dc:context>
3620 </dc:macro> 3624 </dc:macro>
3621 3625
3622 <!-- infrastructure height imported from CSV-files for S-INFO --> 3626 <!-- infrastructure height imported from CSV-files for S-INFO -->
3623 <dc:macro name="sinfo_infrastructure"> 3627 <dc:macro name="sinfo_predefined_infrastructure">
3624 <dc:context> 3628 <dc:context>
3625 <dc:statement> 3629 <dc:statement>
3626 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, 3630 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3627 MIN(x.name) AS typename, 3631 MIN(x.name) AS typename,
3628 MIN(s.filename) || '&lt;br /&gt;' 3632 MIN(s.filename) || '&lt;br /&gt;'
3644 </dc:if> 3648 </dc:if>
3645 </dc:context> 3649 </dc:context>
3646 </dc:macro> 3650 </dc:macro>
3647 3651
3648 <!-- collisions imported from CSV-files for S-INFO --> 3652 <!-- collisions imported from CSV-files for S-INFO -->
3649 <dc:macro name="sinfo_collisions"> 3653 <dc:macro name="sinfo_predefined_collision">
3650 <dc:context> 3654 <dc:context>
3651 <dc:statement> 3655 <dc:statement>
3652 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, 3656 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,
3653 MIN(s.filename) || '&lt;br /&gt;' 3657 MIN(s.filename) || '&lt;br /&gt;'
3654 || MIN(s.kmrange_info) || '&lt;br /&gt;' 3658 || MIN(s.kmrange_info) || '&lt;br /&gt;'
3665 <dc:for-each> 3669 <dc:for-each>
3666 <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> 3670 <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" />
3667 </dc:for-each> 3671 </dc:for-each>
3668 </dc:if> 3672 </dc:if>
3669 </dc:context> 3673 </dc:context>
3674 </dc:macro>
3675
3676 <!-- U-INFO -->
3677 <dc:macro name="uinfo_salix_line">
3678 <dc:filter expr="$a_state = 'state.uinfo.salix_line'
3679 and ($facet_name = 'uinfo_facet_salix_line' or $facet_name = 'uinfo_facet_salix_line.filtered'
3680 or $facet_name = 'uinfo_facet_salix_mnwmw' or $facet_name = 'uinfo_facet_salix_mnwmw.filtered'
3681 or $facet_name = 'uinfo_facet_salix_scenario' or $facet_name = 'uinfo_facet_salix_scenario.filtered')">
3682 <dc:if test="dc:has-result()">
3683 <uinfo_salix_line>
3684 <dc:for-each>
3685 <dc:element name="${facet_name}">
3686 <dc:attribute name="factory" value="uinfo" />
3687 <dc:attribute name="target_out" value="${out}" />
3688 <dc:attribute name="description" value="${facet_description}" />
3689 <dc:attribute name="ids" value="${facet_num}" />
3690 <dc:attribute name="artifact-id" value="${a_gid}" />
3691 <dc:attribute name="out" value="${out_name}" />
3692 </dc:element>
3693 </dc:for-each>
3694 </uinfo_salix_line>
3695 </dc:if>
3696 </dc:filter>
3670 </dc:macro> 3697 </dc:macro>
3671 3698
3672 <!-- Vegetation zones, edited by the user --> 3699 <!-- Vegetation zones, edited by the user -->
3673 <dc:macro name="vegetationzones"> 3700 <dc:macro name="vegetationzones">
3674 <dc:filter expr="$a_state = 'state.uinfo.vegetation_zones' and $facet_name = 'csv'"> <!-- we misuse the csv-facet --> 3701 <dc:filter expr="$a_state = 'state.uinfo.vegetation_zones' and $facet_name = 'csv'"> <!-- we misuse the csv-facet -->
http://dive4elements.wald.intevation.org