Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 6081:cdd9759b15b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix old calculations datacage parts. - Move the basdata waterlevels out of the user part into the non-recommendations and guard them against showing up in the inline datacage (state.winfo.uesk.wsp) - Add recommendation handling to the user specific part, currently only for official lines - Fix group expressions for heightmarks - Call for-each around the macro-body for basedata additionals to make the variables of the database statement available in that macro
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 24 May 2013 09:22:10 +0200
parents b121b865907d
children 46c18b687fdc
comparison
equal deleted inserted replaced
6080:4bd8bbbcdf68 6081:cdd9759b15b6
252 <dc:when test="$out = 'minfo-heights-epoch'"> 252 <dc:when test="$out = 'minfo-heights-epoch'">
253 <bedheights> 253 <bedheights>
254 <dc:call-macro name="bed-heights-epoch"/> 254 <dc:call-macro name="bed-heights-epoch"/>
255 </bedheights> 255 </bedheights>
256 </dc:when> 256 </dc:when>
257 <dc:when test="$out = 'waterlevels'">
258 <dc:if test="current-state-id != 'state.winfo.uesk.wsp'">
259 <dc:call-macro name="basedata_0"/>
260 <dc:call-macro name="basedata_1_additionals"/>
261 <dc:call-macro name="basedata_2_fixations"/>
262 <dc:call-macro name="basedata_4_heightmarks-points"/>
263 <dc:call-macro name="basedata_5_flood-protections"/>
264 </dc:if>
265 </dc:when>
257 </dc:choose> 266 </dc:choose>
258 </dc:iterate> 267 </dc:iterate>
259 </dc:otherwise> 268 </dc:otherwise>
260 </dc:choose> 269 </dc:choose>
261 </dc:call-macro> 270 </dc:call-macro>
263 </dc:macro> 272 </dc:macro>
264 273
265 <dc:macro name="generate-user-content"> 274 <dc:macro name="generate-user-content">
266 <dc:call-macro name="user-range"> 275 <dc:call-macro name="user-range">
267 <dc:call-macro name="km-filtered-userdata"> 276 <dc:call-macro name="km-filtered-userdata">
268 <dc:iterate var="out" container="artifact-outs"> 277 <dc:choose>
269 <dc:choose> 278 <dc:when test="dc:contains($parameters, 'recommended')">
270 <dc:when test="$out = 'longitudinal_section'"> 279 <dc:comment>
271 <dc:call-macro name="longitudinal"/> 280 Recommendations (client shall load immediately).
272 <dc:call-macro name="differences"/> 281 </dc:comment>
273 <dc:call-macro name="officiallines_user"/> 282 <dc:iterate var="out" container="artifact-outs">
274 </dc:when> 283 <dc:choose>
275 <dc:when test="$out = 'discharge_longitudinal_section'"> 284 <dc:when test="$out = 'longitudinal_section'">
276 <dc:call-macro name="longitudinal"/> 285 <dc:call-macro name="officiallines_user"/>
277 <dc:call-macro name="differences"/> 286 </dc:when>
278 </dc:when> 287 </dc:choose>
279 <dc:when test="$out = 'w_differences'"> 288 </dc:iterate>
280 <dc:call-macro name="longitudinal"/> 289 </dc:when>
281 <dc:call-macro name="differences"/> 290 <dc:otherwise>
282 </dc:when> 291 <dc:comment>
283 <dc:when test="$out = 'fix_deltawt_curve'"> 292 Non Recommendations
284 <dc:call-macro name="delta-wt"/> 293 </dc:comment>
285 </dc:when> 294 <dc:iterate var="out" container="artifact-outs">
286 <dc:when test="$out = 'reference_curve'"> 295 <dc:choose>
287 <dc:call-macro name="reference-curves"/> 296 <dc:when test="$out = 'longitudinal_section'">
288 </dc:when> 297 <dc:call-macro name="longitudinal"/>
289 <dc:when test="$out = 'computed_discharge_curve'"> 298 <dc:call-macro name="differences"/>
290 <dc:call-macro name="computed-discharge-curve"/> 299 </dc:when>
291 </dc:when> 300 <dc:when test="$out = 'discharge_longitudinal_section'">
292 <dc:when test="$out = 'cross_section'"> 301 <dc:call-macro name="longitudinal"/>
293 <dc:call-macro name="waterlevels"/> 302 <dc:call-macro name="differences"/>
294 </dc:when> 303 </dc:when>
295 <dc:when test="$out = 'fix_longitudinal_section_curve'"> 304 <dc:when test="$out = 'w_differences'">
296 <dc:call-macro name="longitudinal-section"/> 305 <dc:call-macro name="longitudinal"/>
297 </dc:when> 306 <dc:call-macro name="differences"/>
298 <dc:when test="$out = 'fix_derivate_curve'"> 307 </dc:when>
299 <dc:call-macro name="fix-derivate-curve"/> 308 <dc:when test="$out = 'fix_deltawt_curve'">
300 </dc:when> 309 <dc:call-macro name="delta-wt"/>
301 <dc:when test="$out = 'fix_wq_curve'"> 310 </dc:when>
302 <dc:call-macro name="fix-wq-curve"/> 311 <dc:when test="$out = 'reference_curve'">
303 </dc:when> 312 <dc:call-macro name="reference-curves"/>
304 <dc:when test="$out = 'duration_curve'"> 313 </dc:when>
305 <dc:call-macro name="duration-curve"/> 314 <dc:when test="$out = 'computed_discharge_curve'">
306 </dc:when> 315 <dc:call-macro name="computed-discharge-curve"/>
307 <dc:when test="$out = 'waterlevels'"> 316 </dc:when>
308 <dc:call-macro name="basedata_0"/> 317 <dc:when test="$out = 'cross_section'">
309 <dc:call-macro name="basedata_1_additionals"/> 318 <dc:call-macro name="waterlevels"/>
310 <dc:call-macro name="basedata_2_fixations"/> 319 </dc:when>
311 <dc:call-macro name="basedata_4_heightmarks-points"/> 320 <dc:when test="$out = 'fix_longitudinal_section_curve'">
312 <dc:call-macro name="basedata_5_flood-protections"/> 321 <dc:call-macro name="longitudinal-section"/>
313 <dc:call-macro name="waterlevels-fix"/> 322 </dc:when>
314 </dc:when> 323 <dc:when test="$out = 'fix_derivate_curve'">
315 <dc:when test="$out = 'fix_wq_curve'"> 324 <dc:call-macro name="fix-derivate-curve"/>
316 <dc:call-macro name="waterlevels-fix"/> 325 </dc:when>
317 </dc:when> 326 <dc:when test="$out = 'fix_wq_curve'">
318 <dc:when test="$out = 'floodmap'"> 327 <dc:call-macro name="fix-wq-curve"/>
319 <dc:call-macro name="flood-map"/> 328 </dc:when>
320 </dc:when> 329 <dc:when test="$out = 'duration_curve'">
321 <dc:when test="$out = 'map'"> 330 <dc:call-macro name="duration-curve"/>
322 <dc:call-macro name="flood-map"/> 331 </dc:when>
323 </dc:when> 332 <dc:when test="$out = 'waterlevels'">
324 <dc:when test="$out = 'bedheight_middle'"> 333 <dc:call-macro name="waterlevels-fix"/>
325 <dc:call-macro name="waterlevels-discharge"/> 334 </dc:when>
326 <dc:call-macro name="waterlevels-fix"/> 335 <dc:when test="$out = 'fix_wq_curve'">
327 </dc:when> 336 <dc:call-macro name="waterlevels-fix"/>
328 <dc:when test="$out = 'floodmap-hws'"> 337 </dc:when>
329 <dc:call-macro name="floodmap-hws-user"/> 338 <dc:when test="$out = 'floodmap'">
330 </dc:when> 339 <dc:call-macro name="flood-map"/>
331 <dc:when test="$out = 'flow_velocity'"> 340 </dc:when>
332 <dc:call-macro name="bedquality-bed"/> 341 <dc:when test="$out = 'map'">
333 <dc:call-macro name="bedquality-load"/> 342 <dc:call-macro name="flood-map"/>
334 </dc:when> 343 </dc:when>
335 <dc:when test="$out = 'bed_longitudinal_section'"> 344 <dc:when test="$out = 'bedheight_middle'">
336 <dc:call-macro name="bedquality-bed"/> 345 <dc:call-macro name="waterlevels-discharge"/>
337 <dc:call-macro name="bedquality-load"/> 346 <dc:call-macro name="waterlevels-fix"/>
338 <dc:call-macro name="bedquality-density"/> 347 </dc:when>
339 <dc:call-macro name="bedquality-porosity"/> 348 <dc:when test="$out = 'floodmap-hws'">
340 </dc:when> 349 <dc:call-macro name="floodmap-hws-user"/>
341 <dc:when test="$out = 'sedimentload_ls'"> 350 </dc:when>
342 <dc:call-macro name="differences"/> 351 <dc:when test="$out = 'flow_velocity'">
343 <dc:call-macro name="bedheight-differences"/> 352 <dc:call-macro name="bedquality-bed"/>
344 <dc:call-macro name="flow-velocity"/> 353 <dc:call-macro name="bedquality-load"/>
345 <dc:call-macro name="sediment-load"/> 354 </dc:when>
346 </dc:when> 355 <dc:when test="$out = 'bed_longitudinal_section'">
347 <dc:when test="$out = 'bed_difference_year'"> 356 <dc:call-macro name="bedquality-bed"/>
348 <dc:call-macro name="waterlevels-discharge"/> 357 <dc:call-macro name="bedquality-load"/>
349 <dc:call-macro name="bedheight-differences"/> 358 <dc:call-macro name="bedquality-density"/>
350 <dc:call-macro name="differences"/> 359 <dc:call-macro name="bedquality-porosity"/>
351 <dc:call-macro name="waterlevels-fix"/> 360 </dc:when>
352 <dc:call-macro name="delta-wt-ls"/> 361 <dc:when test="$out = 'sedimentload_ls'">
353 </dc:when> 362 <dc:call-macro name="differences"/>
354 <dc:when test="$out = 'bed_difference_epoch'"> 363 <dc:call-macro name="bedheight-differences"/>
355 <dc:call-macro name="waterlevels-discharge"/> 364 <dc:call-macro name="flow-velocity"/>
356 <dc:call-macro name="bedheight-differences"/> 365 <dc:call-macro name="sediment-load"/>
357 <dc:call-macro name="differences"/> 366 </dc:when>
358 <dc:call-macro name="waterlevels-fix"/> 367 <dc:when test="$out = 'bed_difference_year'">
359 <dc:call-macro name="delta-wt-ls"/> 368 <dc:call-macro name="waterlevels-discharge"/>
360 </dc:when> 369 <dc:call-macro name="bedheight-differences"/>
361 </dc:choose> 370 <dc:call-macro name="differences"/>
362 </dc:iterate> 371 <dc:call-macro name="waterlevels-fix"/>
363 </dc:call-macro> 372 <dc:call-macro name="delta-wt-ls"/>
373 </dc:when>
374 <dc:when test="$out = 'bed_difference_epoch'">
375 <dc:call-macro name="waterlevels-discharge"/>
376 <dc:call-macro name="bedheight-differences"/>
377 <dc:call-macro name="differences"/>
378 <dc:call-macro name="waterlevels-fix"/>
379 <dc:call-macro name="delta-wt-ls"/>
380 </dc:when>
381 </dc:choose>
382 </dc:iterate>
383 </dc:otherwise>
384 </dc:choose>
385 </dc:call-macro>
364 </dc:call-macro> 386 </dc:call-macro>
365 </dc:macro> 387 </dc:macro>
366 388
367 <!-- Macros to load user data --> 389 <!-- Macros to load user data -->
368 390
1292 1314
1293 <dc:macro name="basedata_4_heightmarks-points"> 1315 <dc:macro name="basedata_4_heightmarks-points">
1294 <dc:filter expr="$kind=4"> 1316 <dc:filter expr="$kind=4">
1295 <dc:if test="dc:has-result()"> 1317 <dc:if test="dc:has-result()">
1296 <heightmarks> 1318 <heightmarks>
1297 <dc:group expr="{dc:replace($wst_description, 'HW-Marken/', '')}"> 1319 <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
1298 <heightmark name="dc:group-key()"> 1320 <heightmark name="dc:group-key()">
1299 <dc:for-each> 1321 <dc:for-each>
1300 <column name="{$wst_column_name}" 1322 <column name="{$wst_column_name}"
1301 ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" 1323 ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
1302 factory="staticwkms" 1324 factory="staticwkms"
1311 1333
1312 <dc:macro name="basedata_4_heightmarks-points-relative_points"> 1334 <dc:macro name="basedata_4_heightmarks-points-relative_points">
1313 <dc:filter expr="$kind=4"> 1335 <dc:filter expr="$kind=4">
1314 <dc:if test="dc:has-result()"> 1336 <dc:if test="dc:has-result()">
1315 <heightmarks> 1337 <heightmarks>
1316 <dc:group expr="{dc:replace($wst_description, 'HW-Marken/', '')}"> 1338 <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
1317 <relativepoint name="dc:group-key()"> 1339 <relativepoint name="dc:group-key()">
1318 <dc:for-each> 1340 <dc:for-each>
1319 <column name="{$wst_column_name}" 1341 <column name="{$wst_column_name}"
1320 ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" 1342 ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
1321 factory="staticwkms" 1343 factory="staticwkms"
1642 <dc:filter expr="$kind=1"> 1664 <dc:filter expr="$kind=1">
1643 <dc:if test="dc:has-result()"> 1665 <dc:if test="dc:has-result()">
1644 <additionals> 1666 <additionals>
1645 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> 1667 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
1646 <additional name="{dc:group-key()}"> 1668 <additional name="{dc:group-key()}">
1647 <dc:macro-body/> 1669 <dc:for-each>
1670 <dc:macro-body/>
1671 </dc:for-each>
1648 </additional> 1672 </additional>
1649 </dc:group> 1673 </dc:group>
1650 </additionals> 1674 </additionals>
1651 </dc:if> 1675 </dc:if>
1652 </dc:filter> 1676 </dc:filter>
http://dive4elements.wald.intevation.org