Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/meta-data.xml @ 5669:dc731d2937f9
Added basedata and old calculations to middle bedheight dc and added new macros.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 12 Apr 2013 09:41:56 +0200 |
parents | ca4b6263996c |
children | 40e909e52e4e |
comparison
equal
deleted
inserted
replaced
5668:ab5db981044c | 5669:dc731d2937f9 |
---|---|
766 <dc:comment> | 766 <dc:comment> |
767 MINFO bedheight middle | 767 MINFO bedheight middle |
768 </dc:comment> | 768 </dc:comment> |
769 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')"> | 769 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')"> |
770 <dc:call-macro name="sounding-width"/> | 770 <dc:call-macro name="sounding-width"/> |
771 <dc:call-macro name="basedata_0"/> | |
772 <dc:call-macro name="basedata_1_additionals"/> | |
773 <dc:call-macro name="basedata_2_fixations"/> | |
774 <dc:call-macro name="basedata_3_officials"/> | |
775 <dc:call-macro name="annotations_per_type"/> | |
771 </dc:if> | 776 </dc:if> |
772 <dc:comment comment="--- non-recommendations---"/> | 777 <dc:comment comment="--- non-recommendations---"/> |
773 </dc:otherwise> | 778 </dc:otherwise> |
774 </dc:choose> | 779 </dc:choose> |
775 | 780 |
2882 </dc:context> | 2887 </dc:context> |
2883 </dc:for-each> | 2888 </dc:for-each> |
2884 </bedheight-differences> | 2889 </bedheight-differences> |
2885 </dc:macro> | 2890 </dc:macro> |
2886 | 2891 |
2892 <dc:macro name="fixings-year"> | |
2893 <fixings> | |
2894 <dc:for-each> | |
2895 <dc:context> | |
2896 <dc:call-macro name="range-filter"> | |
2897 <dc:context> | |
2898 <dc:statement> | |
2899 SELECT ou.id AS oid | |
2900 FROM outs AS ou, artifacts AS ar | |
2901 WHERE | |
2902 ar.state = 'state.fix.vollmer.compute' AND | |
2903 ou.name = 'longitudinal_section' | |
2904 </dc:statement> | |
2905 <dc:for-each> | |
2906 <fix description="{$river} {$a_id} {$a_creation} {$collection_name}"> | |
2907 <dc:context> | |
2908 <dc:statement> | |
2909 SELECT a.gid AS aid, | |
2910 f.id AS fid, | |
2911 f.name AS facet_name, | |
2912 f.num AS facet_num, | |
2913 f.description AS facet_description | |
2914 FROM outs AS o, facets AS f, artifacts AS a | |
2915 WHERE f.name = 'longitudinal_section.w' AND | |
2916 f.out_id = o.id AND | |
2917 o.artifact_id = ${a_id} AND | |
2918 a.id = ${a_id} | |
2919 </dc:statement> | |
2920 <dc:for-each> | |
2921 <dc:element name="${facet_name}"> | |
2922 <dc:attribute name="factory" value="fixanalysis"/> | |
2923 <dc:attribute name="description" value="${facet_description}"/> | |
2924 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> | |
2925 <dc:attribute name="artifact-id" value="${aid}"/> | |
2926 <dc:attribute name="out" value="longitudinal_section"/> | |
2927 </dc:element> | |
2928 </dc:for-each> | |
2929 </dc:context> | |
2930 </fix> | |
2931 </dc:for-each> | |
2932 </dc:context> | |
2933 </dc:call-macro> | |
2934 </dc:context> | |
2935 </dc:for-each> | |
2936 </fixings> | |
2937 </dc:macro> | |
2938 | |
2939 <dc:macro name="waterlevels-discharge"> | |
2940 <waterlevels-discharge> | |
2941 <dc:for-each> | |
2942 <dc:context> | |
2943 <dc:call-macro name="range-filter"> | |
2944 <dc:context> | |
2945 <dc:statement> | |
2946 SELECT id AS oid | |
2947 FROM outs AS o | |
2948 WHERE | |
2949 o.artifact_id = ${a_id} AND | |
2950 o.name = 'discharge_longitudinal_section' | |
2951 </dc:statement> | |
2952 <dc:for-each> | |
2953 <discharge description="{$oid} {$river} {$a_id} {$a_creation} {$collection_name}"> | |
2954 <dc:context> | |
2955 <dc:statement> | |
2956 SELECT a.gid AS aid, | |
2957 f.id AS fid, | |
2958 f.name AS facet_name, | |
2959 f.num AS facet_num, | |
2960 f.description AS facet_description | |
2961 FROM outs AS o, facets AS f, artifacts AS a | |
2962 WHERE f.name = 'discharge_longitudinal_section.w' AND | |
2963 f.out_id = o.id AND | |
2964 o.artifact_id = ${a_id} AND | |
2965 a.id = ${a_id} | |
2966 </dc:statement> | |
2967 <dc:for-each> | |
2968 <dc:element name="${facet_name}"> | |
2969 <dc:attribute name="factory" value="winfo"/> | |
2970 <dc:attribute name="description" value="${facet_description}"/> | |
2971 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> | |
2972 <dc:attribute name="artifact-id" value="${aid}"/> | |
2973 <dc:attribute name="out" value="longitudinal_section"/> | |
2974 </dc:element> | |
2975 </dc:for-each> | |
2976 </dc:context> | |
2977 </discharge> | |
2978 </dc:for-each> | |
2979 </dc:context> | |
2980 </dc:call-macro> | |
2981 </dc:context> | |
2982 </dc:for-each> | |
2983 </waterlevels-discharge> | |
2984 </dc:macro> | |
2887 | 2985 |
2888 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')))"> | 2986 <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')))"> |
2889 <dc:call-macro name="longitudinal"/> | 2987 <dc:call-macro name="longitudinal"/> |
2890 </dc:if> | 2988 </dc:if> |
2891 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> | 2989 <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> |
2923 </dc:if> | 3021 </dc:if> |
2924 <dc:if test="dc:contains($artifact-outs, 'bed_difference_year') or dc:contains($artifact-outs, 'bed_difference_height_year')"> | 3022 <dc:if test="dc:contains($artifact-outs, 'bed_difference_year') or dc:contains($artifact-outs, 'bed_difference_height_year')"> |
2925 <dc:call-macro name="bed-difference"/> | 3023 <dc:call-macro name="bed-difference"/> |
2926 </dc:if> | 3024 </dc:if> |
2927 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')"> | 3025 <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')"> |
2928 <dc:call-macro name="bed-height"/> | 3026 <dc:call-macro name="waterlevels-discharge"/> |
3027 <dc:call-macro name="waterlevels-fix"/> | |
2929 </dc:if> | 3028 </dc:if> |
2930 <dc:if test="dc:contains($artifact-outs, 'floodmap-hws')"> | 3029 <dc:if test="dc:contains($artifact-outs, 'floodmap-hws')"> |
2931 <dc:call-macro name="floodmap-hws-user"/> | 3030 <dc:call-macro name="floodmap-hws-user"/> |
2932 </dc:if> | 3031 </dc:if> |
2933 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> | 3032 <dc:if test="dc:contains($artifact-outs, 'flow_velocity')"> |