Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 6518:1a7f5d09b9d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Longitudinal sections: partly renamed outs and configured recommendations at once
author Tom Gottfried <tom@intevation.de>
date Fri, 28 Jun 2013 21:08:23 +0200
parents d1d503584d34
children f4872350b50f dd5355775ce1
comparison
equal deleted inserted replaced
6517:ef3b02034f6a 6518:1a7f5d09b9d8
43 <dc:comment> 43 <dc:comment>
44 Recommendations (client shall load immediately). 44 Recommendations (client shall load immediately).
45 </dc:comment> 45 </dc:comment>
46 <dc:iterate var="out" container="artifact-outs"> 46 <dc:iterate var="out" container="artifact-outs">
47 <dc:choose> 47 <dc:choose>
48 <dc:when test="$out = 'w_differences'"> 48 <dc:when test="dc:contains($out, 'longitudinal_section')">
49 <dc:call-macro name="annotations"/>
50 </dc:when>
51 <dc:when test="$out = 'discharge_longitudinal_section'">
52 <dc:call-macro name="annotations"/> 49 <dc:call-macro name="annotations"/>
53 <dc:call-macro name="officiallines_user"/> 50 <dc:call-macro name="officiallines_user"/>
54 </dc:when> 51 </dc:when>
55 <dc:when test="$out = 'historical_discharge_wq'"> 52 <dc:when test="$out = 'historical_discharge_wq'">
56 <dc:call-macro name="mainvalues"/> 53 <dc:call-macro name="mainvalues"/>
105 </dc:when> 102 </dc:when>
106 <dc:when test="$out = 'minfo-heights-epoch'"> 103 <dc:when test="$out = 'minfo-heights-epoch'">
107 <bedheights> 104 <bedheights>
108 <dc:call-macro name="bed-heights-epoch"/> 105 <dc:call-macro name="bed-heights-epoch"/>
109 </bedheights> 106 </bedheights>
110 </dc:when>
111 <dc:when test="$out = 'sedimentload_ls'">
112 <dc:call-macro name="annotations"/>
113 </dc:when> 107 </dc:when>
114 </dc:choose> 108 </dc:choose>
115 </dc:iterate> 109 </dc:iterate>
116 </dc:when> 110 </dc:when>
117 <dc:otherwise> 111 <dc:otherwise>
131 <dc:call-macro name="hyks"/> 125 <dc:call-macro name="hyks"/>
132 </dc:when> 126 </dc:when>
133 <dc:when test="$out = 'longitudinal_section'"> 127 <dc:when test="$out = 'longitudinal_section'">
134 <dc:call-macro name="longitudinal-section-prototype"/> 128 <dc:call-macro name="longitudinal-section-prototype"/>
135 </dc:when> 129 </dc:when>
136 <dc:when test="$out = 'w_differences'"> 130 <dc:when test="$out = 'w_differences_longitudinal_section'">
137 <dc:call-macro name="longitudinal-section-prototype"/> 131 <dc:call-macro name="longitudinal-section-prototype"/>
138 </dc:when> 132 </dc:when>
139 <dc:when test="$out = 'discharge_longitudinal_section'"> 133 <dc:when test="$out = 'discharge_longitudinal_section'">
140 <dc:call-macro name="longitudinal-section-prototype"/> 134 <dc:call-macro name="longitudinal-section-prototype"/>
141 </dc:when> 135 </dc:when>
170 <dc:call-macro name="longitudinal-section-prototype"/> 164 <dc:call-macro name="longitudinal-section-prototype"/>
171 </dc:when> 165 </dc:when>
172 <dc:when test="$out = 'map'"> 166 <dc:when test="$out = 'map'">
173 <dc:call-macro name="flood-map-complete"/> 167 <dc:call-macro name="flood-map-complete"/>
174 </dc:when> 168 </dc:when>
175 <dc:when test="$out = 'flow_velocity'"> 169 <dc:when test="$out = 'flow_velocity_longitudinal_section'">
176 <dc:call-macro name="annotations_per_type"/> 170 <dc:call-macro name="annotations_per_type"/>
177 <dc:call-macro name="flow_velocity_measurements"/> 171 <dc:call-macro name="flow_velocity_measurements"/>
178 </dc:when> 172 </dc:when>
179 <dc:when test="$out = 'bed_longitudinal_section'"> 173 <dc:when test="$out = 'bed_longitudinal_section'">
180 <dc:call-macro name="annotations_per_type"/> 174 <dc:call-macro name="annotations_per_type"/>
181 </dc:when> 175 </dc:when>
182 <dc:when test="$out = 'sedimentload_ls'"> 176 <dc:when test="$out = 'sedimentload_longitudinal_section'">
183 <dc:call-macro name="annotations_per_type"/> 177 <dc:call-macro name="annotations_per_type"/>
184 <dc:call-macro name="morph_width"/> 178 <dc:call-macro name="morph_width"/>
185 </dc:when> 179 </dc:when>
186 <dc:when test="$out = 'bedheight_middle'"> 180 <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
187 <dc:call-macro name="sounding-width"/> 181 <dc:call-macro name="sounding-width"/>
188 <dc:call-macro name="basedata_0"/> 182 <dc:call-macro name="basedata_0"/>
189 <dc:call-macro name="basedata_1_additionals"/> 183 <dc:call-macro name="basedata_1_additionals"/>
190 <dc:call-macro name="basedata_2_fixations"/> 184 <dc:call-macro name="basedata_2_fixations"/>
191 <dc:call-macro name="basedata_3_officials"/> 185 <dc:call-macro name="basedata_3_officials"/>
192 <dc:call-macro name="annotations_per_type"/> 186 <dc:call-macro name="annotations_per_type"/>
193 </dc:when> 187 </dc:when>
194 <dc:when test="$out = 'bed_difference_height_year'"> 188 <dc:when test="$out = 'bed_difference_height_year_longitudinal_section'">
195 <dc:call-macro name="basedata_0"/> 189 <dc:call-macro name="basedata_0"/>
196 <dc:call-macro name="basedata_1_additionals"/> 190 <dc:call-macro name="basedata_1_additionals"/>
197 <dc:call-macro name="basedata_2_fixations"/> 191 <dc:call-macro name="basedata_2_fixations"/>
198 <dc:call-macro name="basedata_3_officials"/> 192 <dc:call-macro name="basedata_3_officials"/>
199 <dc:call-macro name="basedata_6_delta_w"/> 193 <dc:call-macro name="basedata_6_delta_w"/>
200 <dc:call-macro name="annotations_per_type"/> 194 <dc:call-macro name="annotations_per_type"/>
201 <dc:call-macro name="morph_width"/> 195 <dc:call-macro name="morph_width"/>
202 </dc:when> 196 </dc:when>
203 <dc:when test="$out = 'bed_difference_year'"> 197 <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
204 <dc:call-macro name="basedata_0"/> 198 <dc:call-macro name="basedata_0"/>
205 <dc:call-macro name="basedata_1_additionals"/> 199 <dc:call-macro name="basedata_1_additionals"/>
206 <dc:call-macro name="basedata_2_fixations"/> 200 <dc:call-macro name="basedata_2_fixations"/>
207 <dc:call-macro name="basedata_3_officials"/> 201 <dc:call-macro name="basedata_3_officials"/>
208 <dc:call-macro name="basedata_6_delta_w"/> 202 <dc:call-macro name="basedata_6_delta_w"/>
209 <dc:call-macro name="annotations_per_type"/> 203 <dc:call-macro name="annotations_per_type"/>
210 <dc:call-macro name="morph_width"/> 204 <dc:call-macro name="morph_width"/>
211 </dc:when> 205 </dc:when>
212 <dc:when test="$out = 'bed_difference_epoch'"> 206 <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
213 <dc:call-macro name="basedata_0"/> 207 <dc:call-macro name="basedata_0"/>
214 <dc:call-macro name="basedata_1_additionals"/> 208 <dc:call-macro name="basedata_1_additionals"/>
215 <dc:call-macro name="basedata_2_fixations"/> 209 <dc:call-macro name="basedata_2_fixations"/>
216 <dc:call-macro name="basedata_3_officials"/> 210 <dc:call-macro name="basedata_3_officials"/>
217 <dc:call-macro name="annotations_per_type"/> 211 <dc:call-macro name="annotations_per_type"/>
314 </dc:when> 308 </dc:when>
315 <dc:when test="$out = 'discharge_longitudinal_section'"> 309 <dc:when test="$out = 'discharge_longitudinal_section'">
316 <dc:call-macro name="longitudinal"/> 310 <dc:call-macro name="longitudinal"/>
317 <dc:call-macro name="differences"/> 311 <dc:call-macro name="differences"/>
318 </dc:when> 312 </dc:when>
319 <dc:when test="$out = 'w_differences'"> 313 <dc:when test="$out = 'w_differences_longitudinal_section'">
320 <dc:call-macro name="longitudinal"/> 314 <dc:call-macro name="longitudinal"/>
321 <dc:call-macro name="differences"/> 315 <dc:call-macro name="differences"/>
322 </dc:when> 316 </dc:when>
323 <dc:when test="$out = 'fix_deltawt_curve'"> 317 <dc:when test="$out = 'fix_deltawt_curve'">
324 <dc:call-macro name="delta-wt"/> 318 <dc:call-macro name="delta-wt"/>
354 <dc:call-macro name="flood-map"/> 348 <dc:call-macro name="flood-map"/>
355 </dc:when> 349 </dc:when>
356 <dc:when test="$out = 'map'"> 350 <dc:when test="$out = 'map'">
357 <dc:call-macro name="flood-map"/> 351 <dc:call-macro name="flood-map"/>
358 </dc:when> 352 </dc:when>
359 <dc:when test="$out = 'bedheight_middle'"> 353 <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
360 <dc:call-macro name="waterlevels-discharge"/> 354 <dc:call-macro name="waterlevels-discharge"/>
361 <dc:call-macro name="waterlevels-fix"/> 355 <dc:call-macro name="waterlevels-fix"/>
362 </dc:when> 356 </dc:when>
363 <dc:when test="$out = 'floodmap-hws'"> 357 <dc:when test="$out = 'floodmap-hws'">
364 <dc:call-macro name="floodmap-hws-user"/> 358 <dc:call-macro name="floodmap-hws-user"/>
365 </dc:when> 359 </dc:when>
366 <dc:when test="$out = 'flow_velocity'"> 360 <dc:when test="$out = 'flow_velocity_longitudinal_section'">
367 <dc:call-macro name="bedquality-bed"/> 361 <dc:call-macro name="bedquality-bed"/>
368 <dc:call-macro name="bedquality-load"/> 362 <dc:call-macro name="bedquality-load"/>
369 </dc:when> 363 </dc:when>
370 <dc:when test="$out = 'bed_longitudinal_section'"> 364 <dc:when test="$out = 'bed_longitudinal_section'">
371 <dc:call-macro name="bedquality-bed"/> 365 <dc:call-macro name="bedquality-bed"/>
372 <dc:call-macro name="bedquality-load"/> 366 <dc:call-macro name="bedquality-load"/>
373 <dc:call-macro name="bedquality-density"/> 367 <dc:call-macro name="bedquality-density"/>
374 <dc:call-macro name="bedquality-porosity"/> 368 <dc:call-macro name="bedquality-porosity"/>
375 </dc:when> 369 </dc:when>
376 <dc:when test="$out = 'sedimentload_ls'"> 370 <dc:when test="$out = 'sedimentload_longitudinal_section'">
377 <dc:call-macro name="differences"/> 371 <dc:call-macro name="differences"/>
378 <dc:call-macro name="bedheight-differences"/> 372 <dc:call-macro name="bedheight-differences"/>
379 <dc:call-macro name="flow-velocity"/> 373 <dc:call-macro name="flow-velocity"/>
380 <dc:call-macro name="sediment-load"/> 374 <dc:call-macro name="sediment-load"/>
381 </dc:when> 375 </dc:when>
382 <dc:when test="$out = 'bed_difference_year'"> 376 <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
383 <dc:call-macro name="waterlevels-discharge"/> 377 <dc:call-macro name="waterlevels-discharge"/>
384 <dc:call-macro name="bedheight-differences"/> 378 <dc:call-macro name="bedheight-differences"/>
385 <dc:call-macro name="differences"/> 379 <dc:call-macro name="differences"/>
386 <dc:call-macro name="waterlevels-fix"/> 380 <dc:call-macro name="waterlevels-fix"/>
387 <dc:call-macro name="delta-wt-ls"/> 381 <dc:call-macro name="delta-wt-ls"/>
388 </dc:when> 382 </dc:when>
389 <dc:when test="$out = 'bed_difference_epoch'"> 383 <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
390 <dc:call-macro name="waterlevels-discharge"/> 384 <dc:call-macro name="waterlevels-discharge"/>
391 <dc:call-macro name="bedheight-differences"/> 385 <dc:call-macro name="bedheight-differences"/>
392 <dc:call-macro name="differences"/> 386 <dc:call-macro name="differences"/>
393 <dc:call-macro name="waterlevels-fix"/> 387 <dc:call-macro name="waterlevels-fix"/>
394 <dc:call-macro name="delta-wt-ls"/> 388 <dc:call-macro name="delta-wt-ls"/>
412 <w_differences 406 <w_differences
413 description="{$facet_description}" 407 description="{$facet_description}"
414 factory="winfo" target_out="{$out}" 408 factory="winfo" target_out="{$out}"
415 artifact-id="{$aid}" 409 artifact-id="{$aid}"
416 ids="{$aid}" 410 ids="{$aid}"
417 out="w_differences"/> 411 out="w_differences_longitudinal_section"/>
418 </dc:for-each> 412 </dc:for-each>
419 </differences> 413 </differences>
420 </dc:if> 414 </dc:if>
421 </dc:filter> 415 </dc:filter>
422 </dc:macro> 416 </dc:macro>
826 </dc:if> 820 </dc:if>
827 </dc:filter> 821 </dc:filter>
828 </dc:macro> 822 </dc:macro>
829 823
830 <dc:macro name="flow-velocity"> 824 <dc:macro name="flow-velocity">
831 <dc:filter expr="$out_name = 'flow_velocity' and 825 <dc:filter expr="$out_name = 'flow_velocity_longitudinal_section' and
832 ($facet_name = 'flow_velocity.totalchannel' or 826 ($facet_name = 'flow_velocity.totalchannel' or
833 $facet_name = 'flow_velocity.mainchannel' or 827 $facet_name = 'flow_velocity.mainchannel' or
834 $facet_name = 'flow_velocity.totalchannel.filtered' or 828 $facet_name = 'flow_velocity.totalchannel.filtered' or
835 $facet_name = 'flow_velocity.mainchannel.filtered')"> 829 $facet_name = 'flow_velocity.mainchannel.filtered')">
836 <dc:if test="dc:has-result()"> 830 <dc:if test="dc:has-result()">
842 <dc:attribute name="factory" value="minfo"/> 836 <dc:attribute name="factory" value="minfo"/>
843 <dc:attribute name="target_out" value="${out}"/> 837 <dc:attribute name="target_out" value="${out}"/>
844 <dc:attribute name="description" value="${facet_description}"/> 838 <dc:attribute name="description" value="${facet_description}"/>
845 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 839 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
846 <dc:attribute name="artifact-id" value="${a_id}"/> 840 <dc:attribute name="artifact-id" value="${a_id}"/>
847 <dc:attribute name="out" value="flow_velocity"/> 841 <dc:attribute name="out" value="flow_velocity_longitudinal_section"/>
848 </dc:element> 842 </dc:element>
849 </dc:for-each> 843 </dc:for-each>
850 </flow> 844 </flow>
851 </dc:group> 845 </dc:group>
852 </flow-velocity> 846 </flow-velocity>
853 </dc:if> 847 </dc:if>
854 </dc:filter> 848 </dc:filter>
855 </dc:macro> 849 </dc:macro>
856 850
857 <dc:macro name="sediment-load"> 851 <dc:macro name="sediment-load">
858 <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')"> 852 <dc:filter expr="$out_name = 'sedimentload_longitudinal_section' and starts-with($facet_name, 'sedimentload')">
859 <dc:if test="dc:has-result()"> 853 <dc:if test="dc:has-result()">
860 <sediment-load> 854 <sediment-load>
861 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> 855 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
862 <load description="{dc:group-key()}"> 856 <load description="{dc:group-key()}">
863 <dc:for-each> 857 <dc:for-each>
865 <dc:attribute name="factory" value="minfo"/> 859 <dc:attribute name="factory" value="minfo"/>
866 <dc:attribute name="target_out" value="${out}"/> 860 <dc:attribute name="target_out" value="${out}"/>
867 <dc:attribute name="description" value="${facet_description}"/> 861 <dc:attribute name="description" value="${facet_description}"/>
868 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> 862 <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
869 <dc:attribute name="artifact-id" value="${a_id}"/> 863 <dc:attribute name="artifact-id" value="${a_id}"/>
870 <dc:attribute name="out" value="sedimentload_ls"/> 864 <dc:attribute name="out" value="sedimentload_longitudinal_section"/>
871 </dc:element> 865 </dc:element>
872 </dc:for-each> 866 </dc:for-each>
873 </load> 867 </load>
874 </dc:group> 868 </dc:group>
875 </sediment-load> 869 </sediment-load>
876 </dc:if> 870 </dc:if>
877 </dc:filter> 871 </dc:filter>
878 </dc:macro> 872 </dc:macro>
879 873
880 <dc:macro name="bedheight-differences"> 874 <dc:macro name="bedheight-differences">
881 <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and 875 <dc:filter expr="($out_name = 'bed_difference_year_longitudinal_section' or $out_name = 'bed_difference_epoch_longitudinal_section') and
882 (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))"> 876 (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
883 <dc:if test="dc:has-result()"> 877 <dc:if test="dc:has-result()">
884 <bedheight-differences> 878 <bedheight-differences>
885 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> 879 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
886 <difference description="{dc:group-key()}"> 880 <difference description="{dc:group-key()}">
http://dive4elements.wald.intevation.org