Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 9548:669ab639c56b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implemented datacage for sinfo - ueberflutungsdauern Implemented h/Q mainvalues in sinfo - ueberflutungsdauern chart
author gernotbelger
date Fri, 19 Oct 2018 17:19:09 +0200
parents abf4d0b10270
children b9c87bbff6a4
comparison
equal deleted inserted replaced
9547:26ac94cff0b6 9548:669ab639c56b
140 <dc:call-macro name="annotations"/> 140 <dc:call-macro name="annotations"/>
141 </dc:when> 141 </dc:when>
142 <dc:when test="$out = 'sinfo_flood_height'"> 142 <dc:when test="$out = 'sinfo_flood_height'">
143 <dc:call-macro name="annotations"/> 143 <dc:call-macro name="annotations"/>
144 </dc:when> 144 </dc:when>
145 <!--TODO sinfo_floodduration_curve: mainvalues wie in winfo-duration_curve unterstuetzen --> 145 <dc:when test="$out = 'sinfo_floodduration_curve'">
146 <!--dc:when test="$out = 'sinfo_floodduration_curve'">
147 <dc:call-macro name="mainvalues" /> 146 <dc:call-macro name="mainvalues" />
148 </dc:when --> 147 </dc:when>
149 <dc:when test="$out = 'uinfo_salix_line'"> 148 <dc:when test="$out = 'uinfo_salix_line'">
150 <dc:call-macro name="annotations"/> 149 <dc:call-macro name="annotations"/>
151 </dc:when> 150 </dc:when>
152 <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> 151 <dc:when test="$out = 'bundu_wspl_longitudinal_section'">
153 <dc:call-macro name="annotations"/> 152 <dc:call-macro name="annotations"/>
258 <dc:call-macro name="hyks"/> 257 <dc:call-macro name="hyks"/>
259 <dc:call-macro name="predefined_vegetation_zones"/> 258 <dc:call-macro name="predefined_vegetation_zones"/>
260 </dc:when> 259 </dc:when>
261 <dc:comment> Duration curve </dc:comment> 260 <dc:comment> Duration curve </dc:comment>
262 <dc:when test="$out = 'duration_curve'"> 261 <dc:when test="$out = 'duration_curve'">
263 <dc:call-macro name="mainvalues"/> 262 <dc:call-macro name="duration_curve_system"/>
264 <dc:call-macro name="basedata_2_fixations_relative_point"/>
265 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
266 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
267 </dc:when> 263 </dc:when>
268 <dc:comment> Reference curve </dc:comment> 264 <dc:comment> Reference curve </dc:comment>
269 <dc:when test="$out = 'reference_curve'"> 265 <dc:when test="$out = 'reference_curve'">
270 <dc:call-macro name="mainvalues"/> 266 <dc:call-macro name="mainvalues"/>
271 <dc:call-macro name="annotations"/> 267 <dc:call-macro name="annotations"/>
327 <dc:call-macro name="longitudinal-section-prototype"/> 323 <dc:call-macro name="longitudinal-section-prototype"/>
328 </dc:when> 324 </dc:when>
329 <dc:when test="$out = 'sinfo_flood_height'"> 325 <dc:when test="$out = 'sinfo_flood_height'">
330 <dc:call-macro name="longitudinal-section-prototype"/> 326 <dc:call-macro name="longitudinal-section-prototype"/>
331 </dc:when> 327 </dc:when>
332 <!--TODO sinfo_floodduration_curve: mainvalues wie in winfo-duration_curve unterstuetzen --> 328 <dc:when test="$out = 'sinfo_floodduration_curve'">
333 <!--dc:when test="$out = 'sinfo_floodduration_curve'"> 329 <dc:call-macro name="floodduration_curve_system" />
334 <dc:call-macro name="mainvalues" /> 330 </dc:when>
335 <dc:call-macro name="basedata_2_fixations_relative_point" />
336 <dc:call-macro name="basedata_4_heightmarks-points-relative_points" />
337 <dc:call-macro name="basedata_5_flood-protections_relative_points" />
338 </dc:when -->
339
340 <dc:when test="$out = 'uinfo_salix_line'"> 331 <dc:when test="$out = 'uinfo_salix_line'">
341 <dc:call-macro name="longitudinal-section-prototype"/> 332 <dc:call-macro name="longitudinal-section-prototype"/>
342 </dc:when> 333 </dc:when>
343 <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> 334 <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'">
344 <dc:call-macro name="predefined_vegetation_zones"/> 335 <dc:call-macro name="predefined_vegetation_zones"/>
448 <dc:call-macro name="longitudinal-section-user-prototype"/> 439 <dc:call-macro name="longitudinal-section-user-prototype"/>
449 </dc:when> 440 </dc:when>
450 <dc:when test="$out = 'sinfo_flood_duration'"> 441 <dc:when test="$out = 'sinfo_flood_duration'">
451 <dc:call-macro name="longitudinal-section-user-prototype"/> 442 <dc:call-macro name="longitudinal-section-user-prototype"/>
452 </dc:when> 443 </dc:when>
444 <dc:when test="$out = 'sinfo_floodduration_curve'">
445 <dc:call-macro name="floodduration-curve-user"/>
446 </dc:when>
453 <dc:when test="$out = 'sinfo_flood_height'"> 447 <dc:when test="$out = 'sinfo_flood_height'">
454 <dc:call-macro name="longitudinal-section-user-prototype"/> 448 <dc:call-macro name="longitudinal-section-user-prototype"/>
455 </dc:when> 449 </dc:when>
450 <dc:when test="$out = 'sinfo_flowdepth_waterlevels'">
451 <dc:call-macro name="longitudinal-section-fix-vollmer_w"/>
452 </dc:when>
453
456 <dc:when test="$out = 'uinfo_salix_line'"> 454 <dc:when test="$out = 'uinfo_salix_line'">
457 <dc:call-macro name="longitudinal-section-user-prototype"/> 455 <dc:call-macro name="longitudinal-section-user-prototype"/>
458 </dc:when> 456 </dc:when>
459 <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> 457 <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'">
460 <dc:call-macro name="vegetationzones"/> 458 <dc:call-macro name="vegetationzones"/>
461 </dc:when> 459 </dc:when>
460
462 <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> 461 <dc:when test="$out = 'bundu_wspl_longitudinal_section'">
463 <dc:call-macro name="longitudinal-section-user-prototype"/> 462 <dc:call-macro name="longitudinal-section-user-prototype"/>
464 </dc:when> 463 </dc:when>
465 <dc:when test="$out = 'bundu_depth_longitudinal_section'"> 464 <dc:when test="$out = 'bundu_depth_longitudinal_section'">
466 <dc:call-macro name="longitudinal-section-user-prototype"/> 465 <dc:call-macro name="longitudinal-section-user-prototype"/>
495 <dc:when test="$out = 'cross_section'"> 494 <dc:when test="$out = 'cross_section'">
496 <dc:call-macro name="cross_section_user_content"/> 495 <dc:call-macro name="cross_section_user_content"/>
497 </dc:when> 496 </dc:when>
498 <dc:comment> Duration curve </dc:comment> 497 <dc:comment> Duration curve </dc:comment>
499 <dc:when test="$out = 'duration_curve'"> 498 <dc:when test="$out = 'duration_curve'">
500 <dc:call-macro name="duration-curve"/> 499 <dc:call-macro name="duration-curve-user"/>
501 </dc:when> 500 </dc:when>
502 <dc:comment> Reference curve </dc:comment> 501 <dc:comment> Reference curve </dc:comment>
503 <dc:when test="$out = 'reference_curve'"> 502 <dc:when test="$out = 'reference_curve'">
504 <dc:call-macro name="reference-curves"/> 503 <dc:call-macro name="reference-curves"/>
505 </dc:when> 504 </dc:when>
507 <dc:when test="$out = 'floodmap'"> 506 <dc:when test="$out = 'floodmap'">
508 <dc:call-macro name="flood-map"/> 507 <dc:call-macro name="flood-map"/>
509 </dc:when> 508 </dc:when>
510 <dc:when test="$out = 'map'"> 509 <dc:when test="$out = 'map'">
511 <dc:call-macro name="flood-map"/> 510 <dc:call-macro name="flood-map"/>
512 </dc:when>
513
514 <dc:when test="$out = 'sinfo_flowdepth_waterlevels'">
515 <dc:call-macro name="longitudinal-section-fix-vollmer_w"/>
516 </dc:when> 511 </dc:when>
517 </dc:choose> 512 </dc:choose>
518 </dc:iterate> 513 </dc:iterate>
519 </dc:otherwise> 514 </dc:otherwise>
520 </dc:choose> 515 </dc:choose>
879 </computed_discharge_curves> 874 </computed_discharge_curves>
880 </dc:if> 875 </dc:if>
881 </dc:filter> 876 </dc:filter>
882 </dc:macro> 877 </dc:macro>
883 878
884 <dc:macro name="duration-curve"> 879 <!-- Unterschreitungsdauern aus WINFO -->
885 <dc:filter expr="$facet_name = 'duration_curve.q' or $facet_name = 'duration_curve.w'"> 880 <dc:macro name="duration-curve-user">
886 <dc:if test="dc:has-result()"> 881 <dc:call-macro name="duration-curve-user_winfo-duration-curve"/>
882 </dc:macro>
883
884 <!-- Überschrautungsdauern aus SINFO -->
885 <dc:macro name="floodduration-curve-user">
886 <dc:call-macro name="duration-curve-user_sinfo-flood-duration"/>
887 </dc:macro>
888
889 <dc:macro name="duration-curve-user_winfo-duration-curve">
890 <!-- Restults of WINFO-DurationCurve calculation -->
891 <dc:filter expr="$a_state = 'state.winfo.durationcurve' and ( $facet_name = 'duration_curve.q' or $facet_name = 'duration_curve.w' )">
892 <dc:if test="dc:has-result()">
893 <!-- FIXME: this label is wrong, should be rather 'winfo - duration curve' or something -->
887 <computed_discharge_curves> 894 <computed_discharge_curves>
888 <dc:for-each> 895 <dc:for-each>
889 <dc:element name="${facet_name}"> 896 <dc:element name="${facet_name}">
890 <dc:attribute name="description" value="${facet_description}"/> 897 <dc:attribute name="description" value="${facet_description}"/>
891 <dc:attribute name="factory" value="winfo"/> 898 <dc:attribute name="factory" value="winfo"/>
892 <dc:attribute name="target_out" value="${out}"/> 899 <dc:attribute name="target_out" value="${out}"/>
893 <dc:attribute name="artifact-id" value="${a_id}"/> 900 <dc:attribute name="artifact-id" value="${a_gid}"/>
894 <dc:attribute name="ids" value="${a_id}"/> 901 <dc:attribute name="ids" value="${facet_num}"/>
895 <dc:attribute name="out" value="duration_curve"/> 902 <dc:attribute name="out" value="${out_name}"/>
896 </dc:element> 903 </dc:element>
897 </dc:for-each> 904 </dc:for-each>
898 </computed_discharge_curves> 905 </computed_discharge_curves>
899 </dc:if> 906 </dc:if>
900 </dc:filter> 907 </dc:filter>
901 </dc:macro> 908 </dc:macro>
902 909
910 <dc:macro name="duration-curve-user_sinfo-flood-duration">
911 <!-- Restults of SINFO-Überflutungsdauern-Aue calculation -->
912 <dc:filter expr="$a_state = 'state.sinfo.flood_duration' and $out_name = 'sinfo_floodduration_curve'">
913 <!-- FIXME: group by calculation? -->
914 <dc:if test="dc:has-result()">
915 <sinfo_flood_durations>
916
917 <dc:call-macro name="collection-group">
918 <sinfo_flood_durations description="{dc:group-key()}">
919 <dc:for-each>
920 <dc:element name="${facet_name}">
921 <dc:attribute name="description" value="${facet_description}"/>
922 <dc:attribute name="factory" value="sinfo"/>
923 <dc:attribute name="target_out" value="${out}"/>
924 <dc:attribute name="artifact-id" value="${a_gid}"/>
925 <dc:attribute name="ids" value="${facet_num}"/>
926 <dc:attribute name="out" value="${out_name}"/>
927 </dc:element>
928 </dc:for-each>
929 </sinfo_flood_durations>
930 </dc:call-macro>
931 </sinfo_flood_durations>
932 </dc:if>
933 </dc:filter>
934 </dc:macro>
903 935
904 <dc:macro name="waterlevels-user"> 936 <dc:macro name="waterlevels-user">
905 <dc:filter expr="($out_name = 'longitudinal_section' 937 <dc:filter expr="($out_name = 'longitudinal_section'
906 and $facet_name = 'longitudinal_section.w') and 938 and $facet_name = 'longitudinal_section.w') and
907 (not ($current-state-id = 'state.winfo.uesk.wsp' 939 (not ($current-state-id = 'state.winfo.uesk.wsp'
1195 </dc:filter> 1227 </dc:filter>
1196 </dc:macro> 1228 </dc:macro>
1197 1229
1198 1230
1199 <!-- Macros to load system data --> 1231 <!-- Macros to load system data -->
1232
1233 <dc:macro name="duration_curve_system">
1234 <dc:call-macro name="mainvalues"/>
1235 <dc:call-macro name="basedata_2_fixations_relative_point"/>
1236 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
1237 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
1238 </dc:macro>
1239
1240 <dc:macro name="floodduration_curve_system">
1241 <dc:call-macro name="mainvalues"/>
1242 </dc:macro>
1200 1243
1201 <dc:macro name="qmainvalues"> 1244 <dc:macro name="qmainvalues">
1202 <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}"/> 1245 <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}"/>
1203 </dc:macro> 1246 </dc:macro>
1204 1247
http://dive4elements.wald.intevation.org