Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 8241:a65afd85d516

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suggestion: Load official epochs via recommendations instead of a pseudo-calculation.
author Tom Gottfried <tom@intevation.de>
date Tue, 09 Sep 2014 10:53:50 +0200
parents 1cd7225df846
children 9bb8d581f6ca
comparison
equal deleted inserted replaced
8240:61fd22f65bd4 8241:a65afd85d516
113 <dc:call-macro name="bed-heights-epoch"/> 113 <dc:call-macro name="bed-heights-epoch"/>
114 </bedheights> 114 </bedheights>
115 </dc:when> 115 </dc:when>
116 <dc:when test="$out = 'sedimentload_ls'"> 116 <dc:when test="$out = 'sedimentload_ls'">
117 <dc:call-macro name="annotations"/> 117 <dc:call-macro name="annotations"/>
118 <dc:call-macro name="sedimentload_off_epochs"/>
118 </dc:when> 119 </dc:when>
119 <dc:when test="$out = 'bed_longitudinal_section'"> 120 <dc:when test="$out = 'bed_longitudinal_section'">
120 <dc:call-macro name="annotations"/> 121 <dc:call-macro name="annotations"/>
121 </dc:when> 122 </dc:when>
122 <dc:when test="$out = 'flow_velocity'"> 123 <dc:when test="$out = 'flow_velocity'">
1439 '-', dc:date-format('yyyy', $endyear))"/> 1440 '-', dc:date-format('yyyy', $endyear))"/>
1440 </dc:otherwise> 1441 </dc:otherwise>
1441 </dc:choose> 1442 </dc:choose>
1442 <dc:if test="$kind = 'official'"> 1443 <dc:if test="$kind = 'official'">
1443 <dc:variable name="info" type="string" 1444 <dc:variable name="info" type="string"
1444 expr="concat('Amtliche Epoche&lt;BR&gt;', $info)"/> 1445 expr="concat('Amtliche Epoche&lt;BR&gt;', dc:get('info'))"/>
1445 </dc:if> 1446 </dc:if>
1446 <dc:macro-body/> 1447 <dc:macro-body/>
1447 </dc:for-each> 1448 </dc:for-each>
1448 </fraction> 1449 </fraction>
1449 </dc:group> 1450 </dc:group>
3071 </dc:if> 3072 </dc:if>
3072 </dc:container-context> 3073 </dc:container-context>
3073 </dc:if> 3074 </dc:if>
3074 </dc:macro> 3075 </dc:macro>
3075 3076
3077
3078 <dc:macro name="sedimentload_off_epoch_filter">
3079 <dc:if test="dc:has-result()">
3080 <dc:if test="string-length(dc:get('epochs')) &gt; 0">
3081 <dc:variable name="start" type="number"
3082 expr="dc:min-number(dc:find-all('\d{4}', $epochs))"/>
3083 <dc:variable name="end" type="number"
3084 expr="dc:max-number(dc:find-all('\d{4}', $epochs))"/>
3085 </dc:if>
3086 <dc:filter expr="not(number($end) &lt;
3087 number(dc:date-format('yyyy', $startyear))
3088 or number($start) &gt;
3089 number(dc:date-format('yyyy', $endyear)))">
3090 <dc:macro-body/>
3091 </dc:filter>
3092 </dc:if>
3093 </dc:macro>
3094
3095 <dc:macro name="sedimentload_off_epochs">
3096 <dc:variable name="sq_time_id" type="number" expr="number($sq_ti_id)"/>
3097 <dc:context>
3098 <dc:comment> data at measurement stations </dc:comment>
3099 <dc:statement>
3100 SELECT DISTINCT
3101 sl.id AS slid,
3102 slk.kind AS kind,
3103 ti.start_time AS startyear,
3104 ti.stop_time AS endyear,
3105 gf.name AS fraction
3106 FROM sediment_load sl
3107 JOIN sediment_load_kinds slk ON slk.id = sl.kind
3108 JOIN sediment_load_values slv
3109 ON sl.id = slv.sediment_load_id
3110 JOIN measurement_station ms
3111 ON ms.id = slv.measurement_station_id
3112 JOIN rivers r ON ms.river_id = r.id
3113 JOIN time_intervals ti ON sl.time_interval_id = ti.id
3114 JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
3115 WHERE r.id = ${river_id}
3116 AND sq_time_interval_id = ${sq_time_id}
3117 AND ms.station BETWEEN ${fromkm} AND ${tokm}
3118 AND slk.kind = 'official'
3119 </dc:statement>
3120 <dc:call-macro name="sedimentload_off_epoch_filter">
3121 <dc:call-macro name="loads">
3122 <dc:call-macro name="load"/>
3123 </dc:call-macro>
3124 </dc:call-macro>
3125 </dc:context>
3126 <dc:context>
3127 <dc:comment> longitudinal sections </dc:comment>
3128 <dc:statement>
3129 SELECT DISTINCT
3130 sl.id AS slid,
3131 slk.kind AS kind,
3132 ti.start_time AS startyear,
3133 ti.stop_time AS endyear,
3134 sq_time_interval_id AS sqid,
3135 gf.name AS fraction
3136 FROM sediment_load_ls sl
3137 JOIN sediment_load_kinds slk ON slk.id = sl.kind
3138 JOIN rivers r ON sl.river_id = r.id
3139 JOIN sediment_load_ls_values slv
3140 ON sl.id = slv.sediment_load_ls_id
3141 JOIN time_intervals ti ON sl.time_interval_id = ti.id
3142 JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
3143 WHERE r.id = ${river_id}
3144 AND sq_time_interval_id = ${sq_time_id}
3145 AND slv.station BETWEEN ${fromkm} AND ${tokm}
3146 AND slk.kind = 'official'
3147 </dc:statement>
3148 <dc:call-macro name="sedimentload_off_epoch_filter">
3149 <dc:call-macro name="loads">
3150 <dc:call-macro name="load_ls"/>
3151 </dc:call-macro>
3152 </dc:call-macro>
3153 </dc:context>
3154 </dc:macro>
3155
3076 <!-- Common stuff --> 3156 <!-- Common stuff -->
3077 3157
3078 <dc:macro name="km-filtered-wsts"> 3158 <dc:macro name="km-filtered-wsts">
3079 <dc:context connection="system"> 3159 <dc:context connection="system">
3080 <dc:statement> 3160 <dc:statement>
http://dive4elements.wald.intevation.org