Mercurial > dive4elements > river

comparison flys-artifacts/doc/conf/meta-data.xml @ 5591:55d6c5cac9d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added new elements to M-INFO datacage. * New macros for density, porosity and flow velocity. * Added annotations to 'Sohlbeschaffenheit'.
author Raimund Renkert <rrenkert@intevation.de>
date Mon, 08 Apr 2013 14:52:59 +0200
parents d8209556c6fa
children 085711915cc4
comparison
equal deleted inserted replaced
5589:1827798ca53f 5591:55d6c5cac9d1
726 <dc:call-macro name="flood-map-complete"/> 726 <dc:call-macro name="flood-map-complete"/>
727 </dc:if> 727 </dc:if>
728 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> 728 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
729 <dc:call-macro name="annotations_per_type"/> 729 <dc:call-macro name="annotations_per_type"/>
730 <dc:call-macro name="flow_velocity_measurements"/> 730 <dc:call-macro name="flow_velocity_measurements"/>
731 </dc:if>
732 <dc:if test="dc:contains($artifact-outs, 'bed_longitudinal_section')">
733 <dc:call-macro name="annotations_per_type"/>
731 </dc:if> 734 </dc:if>
732 <dc:comment> 735 <dc:comment>
733 MINFO bedheight middle 736 MINFO bedheight middle
734 </dc:comment> 737 </dc:comment>
735 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')"> 738 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')">
2563 </dc:context> 2566 </dc:context>
2564 </dc:for-each> 2567 </dc:for-each>
2565 </bed_quality_load> 2568 </bed_quality_load>
2566 </dc:macro> 2569 </dc:macro>
2567 2570
2571 <dc:macro name="bedquality-density">
2572 <bed_quality_density>
2573 <dc:for-each>
2574 <dc:context>
2575 <dc:call-macro name="range-filter">
2576 <dc:context>
2577 <dc:statement>
2578 SELECT a.gid AS aid,
2579 f.id AS fid,
2580 f.name AS facet_name,
2581 f.num AS facet_num,
2582 f.description AS facet_description
2583 FROM outs AS o, facets AS f, artifacts AS a
2584 WHERE
2585 (f.name = 'bed_longitudinal_section.sediment_density_toplayer' OR
2586 f.name = 'bed_longitudinal_section.sediment_density_sublayer') AND
2587 f.out_id = o.id AND
2588 o.artifact_id = ${a_id} AND
2589 a.id = ${a_id}
2590 </dc:statement>
2591 <dc:for-each>
2592 <dc:element name="${facet_name}">
2593 <dc:attribute name="factory" value="minfo"/>
2594 <dc:attribute name="description" value="${facet_description}"/>
2595 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
2596 <dc:attribute name="artifact-id" value="${aid}"/>
2597 <dc:attribute name="out" value="bed_longitudinal_section"/>
2598 </dc:element>
2599 </dc:for-each>
2600 </dc:context>
2601 </dc:call-macro>
2602 </dc:context>
2603 </dc:for-each>
2604 </bed_quality_density>
2605 </dc:macro>
2606
2607 <dc:macro name="bedquality-porosity">
2608 <bed_quality_porosity>
2609 <dc:for-each>
2610 <dc:context>
2611 <dc:call-macro name="range-filter">
2612 <dc:context>
2613 <dc:statement>
2614 SELECT a.gid AS aid,
2615 f.id AS fid,
2616 f.name AS facet_name,
2617 f.num AS facet_num,
2618 f.description AS facet_description
2619 FROM outs AS o, facets AS f, artifacts AS a
2620 WHERE
2621 (f.name = 'bed_longitudinal_section.porosity_toplayer' OR
2622 f.name = 'bed_longitudinal_section.porosity_sublayer') AND
2623 f.out_id = o.id AND
2624 o.artifact_id = ${a_id} AND
2625 a.id = ${a_id}
2626 </dc:statement>
2627 <dc:for-each>
2628 <dc:element name="${facet_name}">
2629 <dc:attribute name="factory" value="minfo"/>
2630 <dc:attribute name="description" value="${facet_description}"/>
2631 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
2632 <dc:attribute name="artifact-id" value="${aid}"/>
2633 <dc:attribute name="out" value="bed_longitudinal_section"/>
2634 </dc:element>
2635 </dc:for-each>
2636 </dc:context>
2637 </dc:call-macro>
2638 </dc:context>
2639 </dc:for-each>
2640 </bed_quality_porosity>
2641 </dc:macro>
2642
2643 <dc:macro name="flow-velocity">
2644 <flow-velocity>
2645 <dc:for-each>
2646 <dc:context>
2647 <dc:call-macro name="range-filter">
2648 <dc:context>
2649 <dc:statement>
2650 SELECT a.gid AS aid,
2651 f.id AS fid,
2652 f.name AS facet_name,
2653 f.num AS facet_num,
2654 f.description AS facet_description
2655 FROM outs AS o, facets AS f, artifacts AS a
2656 WHERE
2657 (f.name = 'flow_velocity.totalchannel' OR
2658 f.name = 'flow_velocity.mainchannel' OR
2659 f.name = 'flow_velocity.totalchannel.filtered' OR
2660 f.name = 'flow_velocity.mainchannel.filtered') AND
2661 f.out_id = o.id AND
2662 o.artifact_id = ${a_id} AND
2663 a.id = ${a_id}
2664 </dc:statement>
2665 <dc:for-each>
2666 <dc:element name="${facet_name}">
2667 <dc:attribute name="factory" value="minfo"/>
2668 <dc:attribute name="description" value="${facet_description}"/>
2669 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
2670 <dc:attribute name="artifact-id" value="${aid}"/>
2671 <dc:attribute name="out" value="bed_longitudinal_section"/>
2672 </dc:element>
2673 </dc:for-each>
2674 </dc:context>
2675 </dc:call-macro>
2676 </dc:context>
2677 </dc:for-each>
2678 </flow-velocity>
2679 </dc:macro>
2680
2568 2681
2569 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')))"> 2682 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')))">
2570 <dc:call-macro name="longitudinal"/> 2683 <dc:call-macro name="longitudinal"/>
2571 </dc:if> 2684 </dc:if>
2572 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> 2685 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')">
2611 <dc:if test="dc:contains($artifact-outs, 'floodmap-hws')"> 2724 <dc:if test="dc:contains($artifact-outs, 'floodmap-hws')">
2612 <dc:call-macro name="floodmap-hws-user"/> 2725 <dc:call-macro name="floodmap-hws-user"/>
2613 </dc:if> 2726 </dc:if>
2614 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> 2727 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
2615 <dc:call-macro name="bedquality-bed"/> 2728 <dc:call-macro name="bedquality-bed"/>
2616 </dc:if>
2617 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
2618 <dc:call-macro name="bedquality-load"/> 2729 <dc:call-macro name="bedquality-load"/>
2730 </dc:if>
2731 <dc:if test="dc:contains($artifact-outs, 'bed_longitudinal_section')">
2732 <dc:call-macro name="bedquality-bed"/>
2733 <dc:call-macro name="bedquality-load"/>
2734 <dc:call-macro name="bedquality-density"/>
2735 <dc:call-macro name="bedquality-porosity"/>
2619 </dc:if> 2736 </dc:if>
2620 </dc:context> 2737 </dc:context>
2621 </dc:call-macro> 2738 </dc:call-macro>
2622 2739
2623 </old_calculations> 2740 </old_calculations>
http://dive4elements.wald.intevation.org