Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8980:b194fa64506a
SINFO - show results themes according to spec, either raw data or floating mean values.
Some improvements to error handling and handling of empty results.
author | gernotbelger |
---|---|
date | Thu, 05 Apr 2018 18:30:34 +0200 |
parents | b98fbd91f64a |
children | 2e27061d9a93 |
comparison
equal
deleted
inserted
replaced
8979:951a4af24a09 | 8980:b194fa64506a |
---|---|
2091 '<BR>Höhensystem: ' || cur_em.name || | 2091 '<BR>Höhensystem: ' || cur_em.name || |
2092 '<BR>ursprüngliches Höhensystem: ' || old_em.name || | 2092 '<BR>ursprüngliches Höhensystem: ' || old_em.name || |
2093 '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || | 2093 '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || |
2094 '<BR>Auswerter: ' || bhs.evaluation_by AS info, | 2094 '<BR>Auswerter: ' || bhs.evaluation_by AS info, |
2095 bhv.height_count AS bedh_height_count, | 2095 bhv.height_count AS bedh_height_count, |
2096 bhv.min_count AS bedh_min_count, | 2096 bhv.min_count AS |
2097 bedh_min_count, | |
2097 bhv.max_count AS bedh_max_count | 2098 bhv.max_count AS bedh_max_count |
2098 FROM bed_height bhs | 2099 FROM bed_height bhs |
2099 JOIN bed_height_type bht ON bht.id = bhs.type_id | 2100 JOIN bed_height_type bht ON bht.id = bhs.type_id |
2100 JOIN location_system ls ON ls.id = location_system_id | 2101 JOIN location_system ls ON ls.id = location_system_id |
2101 JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id | 2102 JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id |
3229 </dc:choose> | 3230 </dc:choose> |
3230 <dc:macro-body/> | 3231 <dc:macro-body/> |
3231 </dc:macro> | 3232 </dc:macro> |
3232 | 3233 |
3233 <dc:macro name="sinfo_flowdepths"> | 3234 <dc:macro name="sinfo_flowdepths"> |
3234 <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth.filtered' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or $facet_name = 'sinfo_facet_flow_depth_current.filtered' or $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )"> | 3235 <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth' or |
3236 $facet_name = 'sinfo_facet_flow_depth.filtered' or | |
3237 $facet_name = 'sinfo_facet_flow_depth_with_tkh' or | |
3238 $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or | |
3239 $facet_name = 'sinfo_facet_flow_depth_current' or | |
3240 $facet_name = 'sinfo_facet_flow_depth_current.filtered' or | |
3241 $facet_name = 'sinfo_facet_flow_depth_historical' or | |
3242 $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )"> | |
3235 <dc:if test="dc:has-result()"> | 3243 <dc:if test="dc:has-result()"> |
3236 <sinfo_flow_depths> | 3244 <sinfo_flow_depths> |
3237 <dc:call-macro name="collection-group"> | 3245 <dc:call-macro name="collection-group"> |
3238 <sinfo_flow_depth description="{dc:group-key()}"> | 3246 <sinfo_flow_depth description="{dc:group-key()}"> |
3239 <dc:for-each> | 3247 <dc:for-each> |
3252 </dc:if> | 3260 </dc:if> |
3253 </dc:filter> | 3261 </dc:filter> |
3254 </dc:macro> | 3262 </dc:macro> |
3255 | 3263 |
3256 <dc:macro name="sinfo_flowdepths_minmax"> | 3264 <dc:macro name="sinfo_flowdepths_minmax"> |
3257 <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth_min.filtered' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> | 3265 <dc:filter expr="( |
3266 $facet_name = 'sinfo_facet_flow_depth_min' or | |
3267 $facet_name = 'sinfo_facet_flow_depth_min.filtered' or | |
3268 $facet_name = 'sinfo_facet_flow_depth_max' or | |
3269 $facet_name = 'sinfo_facet_flow_depth_max.filtered' | |
3270 )"> | |
3258 <dc:if test="dc:has-result()"> | 3271 <dc:if test="dc:has-result()"> |
3259 <sinfo_flow_depths_minmax> | 3272 <sinfo_flow_depths_minmax> |
3260 <dc:call-macro name="collection-group"> | 3273 <dc:call-macro name="collection-group"> |
3261 <sinfo_flow_depth_minmax description="{dc:group-key()}"> | 3274 <sinfo_flow_depth_minmax description="{dc:group-key()}"> |
3262 <dc:for-each> | 3275 <dc:for-each> |
3275 </dc:if> | 3288 </dc:if> |
3276 </dc:filter> | 3289 </dc:filter> |
3277 </dc:macro> | 3290 </dc:macro> |
3278 | 3291 |
3279 <dc:macro name="sinfo_flow_depth_development"> | 3292 <dc:macro name="sinfo_flow_depth_development"> |
3280 <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development.filtered' or $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> | 3293 <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development' or |
3294 $facet_name = 'sinfo_facet_flow_depth_development.filtered' or | |
3295 $facet_name = 'sinfo_facet_flow_depth_development_per_year' | |
3296 $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> | |
3281 <dc:if test="dc:has-result()"> | 3297 <dc:if test="dc:has-result()"> |
3282 <sinfo_flow_depth_developments> | 3298 <sinfo_flow_depth_developments> |
3283 <dc:call-macro name="collection-group"> | 3299 <dc:call-macro name="collection-group"> |
3284 <sinfo_flow_depth_development description="{dc:group-key()}"> | 3300 <sinfo_flow_depth_development description="{dc:group-key()}"> |
3285 <dc:for-each> | 3301 <dc:for-each> |
3367 </dc:if> | 3383 </dc:if> |
3368 </dc:filter> | 3384 </dc:filter> |
3369 </dc:macro> | 3385 </dc:macro> |
3370 | 3386 |
3371 <dc:macro name="sinfo_tkh_velocity"> | 3387 <dc:macro name="sinfo_tkh_velocity"> |
3372 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity.filtered' )"> | 3388 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity' )"> |
3373 <dc:if test="dc:has-result()"> | 3389 <dc:if test="dc:has-result()"> |
3374 <sinfo_velocities> | 3390 <sinfo_velocities> |
3375 <dc:call-macro name="collection-group"> | 3391 <dc:call-macro name="collection-group"> |
3376 <sinfo_velocity description="{dc:group-key()}"> | 3392 <sinfo_velocity description="{dc:group-key()}"> |
3377 <dc:for-each> | 3393 <dc:for-each> |
3390 </dc:if> | 3406 </dc:if> |
3391 </dc:filter> | 3407 </dc:filter> |
3392 </dc:macro> | 3408 </dc:macro> |
3393 | 3409 |
3394 <dc:macro name="sinfo_tkh_d50"> | 3410 <dc:macro name="sinfo_tkh_d50"> |
3395 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50.filtered' )"> | 3411 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50' )"> |
3396 <dc:if test="dc:has-result()"> | 3412 <dc:if test="dc:has-result()"> |
3397 <sinfo_bedqualities> | 3413 <sinfo_bedqualities> |
3398 <sinfo_d50s> | 3414 <sinfo_d50s> |
3399 <dc:call-macro name="collection-group"> | 3415 <dc:call-macro name="collection-group"> |
3400 <sinfo_d50 description="{dc:group-key()}"> | 3416 <sinfo_d50 description="{dc:group-key()}"> |
3415 </dc:if> | 3431 </dc:if> |
3416 </dc:filter> | 3432 </dc:filter> |
3417 </dc:macro> | 3433 </dc:macro> |
3418 | 3434 |
3419 <dc:macro name="sinfo_tkh_tau"> | 3435 <dc:macro name="sinfo_tkh_tau"> |
3420 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau.filtered' )"> | 3436 <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau' )"> |
3421 <dc:if test="dc:has-result()"> | 3437 <dc:if test="dc:has-result()"> |
3422 <sinfo_taus> | 3438 <sinfo_taus> |
3423 <dc:call-macro name="collection-group"> | 3439 <dc:call-macro name="collection-group"> |
3424 <sinfo_tau description="{dc:group-key()}"> | 3440 <sinfo_tau description="{dc:group-key()}"> |
3425 <dc:for-each> | 3441 <dc:for-each> |