Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 6595:61897a2b8283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1395: Renamed bedheight-differences macro, call it from wdiff DC context.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 18 Jul 2013 12:37:08 +0200
parents 5bab963b5d44
children ca56c4e6a755
comparison
equal deleted inserted replaced
6594:2228baf1012a 6595:61897a2b8283
136 <dc:when test="$out = 'longitudinal_section'"> 136 <dc:when test="$out = 'longitudinal_section'">
137 <dc:call-macro name="longitudinal-section-prototype"/> 137 <dc:call-macro name="longitudinal-section-prototype"/>
138 </dc:when> 138 </dc:when>
139 <dc:when test="$out = 'w_differences'"> 139 <dc:when test="$out = 'w_differences'">
140 <dc:call-macro name="longitudinal-section-prototype"/> 140 <dc:call-macro name="longitudinal-section-prototype"/>
141 <dc:call-macro name="bedheight_differences"/>
141 </dc:when> 142 </dc:when>
142 <dc:when test="$out = 'discharge_longitudinal_section'"> 143 <dc:when test="$out = 'discharge_longitudinal_section'">
143 <dc:call-macro name="longitudinal-section-prototype"/> 144 <dc:call-macro name="longitudinal-section-prototype"/>
144 </dc:when> 145 </dc:when>
145 <dc:when test="$out = 'discharge_curve'"> 146 <dc:when test="$out = 'discharge_curve'">
390 <dc:call-macro name="bedquality-density"/> 391 <dc:call-macro name="bedquality-density"/>
391 <dc:call-macro name="bedquality-porosity"/> 392 <dc:call-macro name="bedquality-porosity"/>
392 </dc:when> 393 </dc:when>
393 <dc:when test="$out = 'sedimentload_ls'"> 394 <dc:when test="$out = 'sedimentload_ls'">
394 <dc:call-macro name="differences"/> 395 <dc:call-macro name="differences"/>
395 <dc:call-macro name="bedheight-differences"/> 396 <dc:call-macro name="bedheight_differences"/>
396 <dc:call-macro name="flow-velocity"/> 397 <dc:call-macro name="flow-velocity"/>
397 <dc:call-macro name="sediment-load"/> 398 <dc:call-macro name="sediment-load"/>
398 </dc:when> 399 </dc:when>
399 <dc:when test="$out = 'bed_difference_year'"> 400 <dc:when test="$out = 'bed_difference_year'">
400 <dc:call-macro name="waterlevels-discharge"/> 401 <dc:call-macro name="waterlevels-discharge"/>
401 <dc:call-macro name="bedheight-differences"/> 402 <dc:call-macro name="bedheight_differences"/>
402 <dc:call-macro name="differences"/> 403 <dc:call-macro name="differences"/>
403 <dc:call-macro name="waterlevels-fix"/> 404 <dc:call-macro name="waterlevels-fix"/>
404 <dc:call-macro name="delta-wt-ls"/> 405 <dc:call-macro name="delta-wt-ls"/>
405 </dc:when> 406 </dc:when>
406 <dc:when test="$out = 'bed_difference_epoch'"> 407 <dc:when test="$out = 'bed_difference_epoch'">
407 <dc:call-macro name="waterlevels-discharge"/> 408 <dc:call-macro name="waterlevels-discharge"/>
408 <dc:call-macro name="bedheight-differences"/> 409 <dc:call-macro name="bedheight_differences"/>
409 <dc:call-macro name="differences"/> 410 <dc:call-macro name="differences"/>
410 <dc:call-macro name="waterlevels-fix"/> 411 <dc:call-macro name="waterlevels-fix"/>
411 <dc:call-macro name="delta-wt-ls"/> 412 <dc:call-macro name="delta-wt-ls"/>
412 </dc:when> 413 </dc:when>
413 </dc:choose> 414 </dc:choose>
729 </dc:macro> 730 </dc:macro>
730 731
731 <dc:comment comment="For building differences." /> 732 <dc:comment comment="For building differences." />
732 <dc:macro name="differenceable-fix"> 733 <dc:macro name="differenceable-fix">
733 <beddifferences> 734 <beddifferences>
734 <dc:call-macro name="bedheight-differences"/> 735 <dc:call-macro name="bedheight_differences"/>
735 </beddifferences> 736 </beddifferences>
736 <dc:comment comment="Vollmer curves need own factory"/> 737 <dc:comment comment="Vollmer curves need own factory"/>
737 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and 738 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
738 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))"> 739 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
739 <dc:if test="dc:has-result()"> 740 <dc:if test="dc:has-result()">
962 </sediment-load> 963 </sediment-load>
963 </dc:if> 964 </dc:if>
964 </dc:filter> 965 </dc:filter>
965 </dc:macro> 966 </dc:macro>
966 967
967 <dc:macro name="bedheight-differences"> 968 <dc:macro name="bedheight_differences">
968 <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and 969 <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and
969 (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))"> 970 (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
970 <dc:if test="dc:has-result()"> 971 <dc:if test="dc:has-result()">
971 <bedheight-differences> 972 <bedheight_differences>
972 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> 973 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
973 <difference description="{dc:group-key()}"> 974 <difference description="{dc:group-key()}">
974 <dc:for-each> 975 <dc:for-each>
975 <dc:element name="${facet_name}"> 976 <dc:element name="${facet_name}">
976 <dc:attribute name="factory" value="minfo"/> 977 <dc:attribute name="factory" value="minfo"/>
981 <dc:attribute name="out" value="${out_name}"/> 982 <dc:attribute name="out" value="${out_name}"/>
982 </dc:element> 983 </dc:element>
983 </dc:for-each> 984 </dc:for-each>
984 </difference> 985 </difference>
985 </dc:group> 986 </dc:group>
986 </bedheight-differences> 987 </bedheight_differences>
987 </dc:if> 988 </dc:if>
988 </dc:filter> 989 </dc:filter>
989 </dc:macro> 990 </dc:macro>
990 991
991 <dc:macro name="waterlevels-discharge"> 992 <dc:macro name="waterlevels-discharge">
http://dive4elements.wald.intevation.org