Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 8096:1d2a9c5ee97b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change sedimentload factory from yields to loads.
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 15 Aug 2014 18:24:55 +0200
parents 1c57c9dc1661
children 54dfdba4c4c5
comparison
equal deleted inserted replaced
8095:7b062d9b8e1b 8096:1d2a9c5ee97b
1314 <minfo> 1314 <minfo>
1315 <fixanalysis> 1315 <fixanalysis>
1316 <dc:call-macro name="basedata_6_delta_w"/> 1316 <dc:call-macro name="basedata_6_delta_w"/>
1317 <dc:call-macro name="basedata_7_waterlevels"/> 1317 <dc:call-macro name="basedata_7_waterlevels"/>
1318 </fixanalysis> 1318 </fixanalysis>
1319 <dc:call-macro name="yields"/> 1319 <dc:call-macro name="sedimentloads"/>
1320 <dc:call-macro name="densities"/> 1320 <dc:call-macro name="densities"/>
1321 <dc:call-macro name="minfo-heights"/> 1321 <dc:call-macro name="minfo-heights"/>
1322 <dc:call-macro name="sounding-width"/> 1322 <dc:call-macro name="sounding-width"/>
1323 <dc:call-macro name="morph_width"/> 1323 <dc:call-macro name="morph_width"/>
1324 <dc:call-macro name="porosities"/> 1324 <dc:call-macro name="porosities"/>
1405 </dc:if> 1405 </dc:if>
1406 </dc:context> 1406 </dc:context>
1407 </densities> 1407 </densities>
1408 </dc:macro> 1408 </dc:macro>
1409 1409
1410 <dc:comment> TODO aheinecke: This is a load of data. Needs grouping desperately. And te kidn in the ids;2 field </dc:comment>
1411 <dc:comment> TODO aheinecke: Does seperation by Id even make sense here? Is not a year filter required?</dc:comment>
1412 <dc:macro name="one-load">
1413 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/>
1414 <year description="{$station_name} - {$syear}"
1415 factory="sedimentload"
1416 target_out="{$out}"
1417 info="{$description}"
1418 ids="{$syid};{$station_name} - {$syear}" />
1419 </dc:macro>
1420
1421 <dc:comment> TODO aheinecke: This is a load of data. Needs grouping desperately. And the kind in the name</dc:comment>
1422 <dc:macro name="epoch-load">
1423 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
1424 <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
1425 <year description="{$station_name} - {$syear}-{$eyear}"
1426 factory="sedimentload"
1427 target_out="{$out}"
1428 info="{$description}"
1429 ids="{$syid};{$station_name} - {$syear}-{$eyear}" />
1430 </dc:macro>
1431
1410 <dc:macro name="one-load_ls"> 1432 <dc:macro name="one-load_ls">
1411 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/> 1433 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/>
1434 <dc:comment> TODO aheinecke: Create a sedimentload_ls static facet</dc:comment>
1412 <year description="{$syear}" 1435 <year description="{$syear}"
1413 factory="sedimentyield" 1436 factory="sedimentload"
1414 target_out="{$out}" 1437 target_out="{$out}"
1415 info="{$description}" 1438 info="{$description}"
1416 ids="{$syid}" /> 1439 ids="{$syid}:{$syear}" />
1417 </dc:macro> 1440 </dc:macro>
1418 1441
1419 <dc:macro name="epoch-load_ls"> 1442 <dc:macro name="epoch-load_ls">
1420 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/> 1443 <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
1421 <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/> 1444 <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
1445 <dc:comment> TODO aheinecke: Create a sedimentload_ls static facet</dc:comment>
1422 <year description="{$syear}-{$eyear}" 1446 <year description="{$syear}-{$eyear}"
1423 factory="sedimentyield" 1447 factory="sedimentload"
1424 target_out="{$out}" 1448 target_out="{$out}"
1425 info="{$description}" 1449 info="{$description}"
1426 ids="{$syid}" /> 1450 ids="{$syid};{$syear}-{$eyear}" />
1427 </dc:macro> 1451 </dc:macro>
1428 1452
1429 <dc:macro name="loads"> 1453 <dc:macro name="loads">
1430 <dc:if test="dc:has-result()"> 1454 <dc:if test="dc:has-result()">
1431 <dc:group expr="$fraction"> 1455 <dc:group expr="$fraction">
1437 </fraction> 1461 </fraction>
1438 </dc:group> 1462 </dc:group>
1439 </dc:if> 1463 </dc:if>
1440 </dc:macro> 1464 </dc:macro>
1441 1465
1442 <dc:macro name="yields"> 1466 <dc:macro name="sedimentloads">
1443 <yields> 1467 <dc:comment>
1468 This is the macro for static datacage "Sedimentloads".
1469 Or "Frachten".
1470 </dc:comment>
1471 <sedimentloads>
1444 <dc:call-macro name="annotations_sediment_load_ls"/> 1472 <dc:call-macro name="annotations_sediment_load_ls"/>
1445 <measurement_stations> 1473 <measurement_stations>
1446 <years> 1474 <years>
1447 <dc:context> 1475 <dc:context>
1448 <dc:statement> 1476 <dc:statement>
1449 SELECT DISTINCT 1477 SELECT DISTINCT
1450 sy.id AS syid, 1478 sy.id AS syid,
1451 sy.description AS description, 1479 sy.description AS description,
1452 ti.start_time AS year, 1480 ti.start_time AS year,
1453 gf.name AS fraction 1481 gf.name AS fraction,
1482 ms.name AS station_name
1454 FROM sediment_load sy 1483 FROM sediment_load sy
1455 JOIN sediment_load_values syv 1484 JOIN sediment_load_values syv
1456 ON sy.id = syv.sediment_load_id 1485 ON sy.id = syv.sediment_load_id
1457 JOIN measurement_station ms 1486 JOIN measurement_station ms
1458 ON ms.id = syv.measurement_station_id 1487 ON ms.id = syv.measurement_station_id
1475 SELECT DISTINCT 1504 SELECT DISTINCT
1476 sy.id AS syid, 1505 sy.id AS syid,
1477 sy.description AS description, 1506 sy.description AS description,
1478 ti.start_time AS startyear, 1507 ti.start_time AS startyear,
1479 ti.stop_time AS endyear, 1508 ti.stop_time AS endyear,
1509 ms.name AS station_name,
1480 gf.name AS fraction 1510 gf.name AS fraction
1481 FROM sediment_load sy 1511 FROM sediment_load sy
1482 JOIN sediment_load_values syv 1512 JOIN sediment_load_values syv
1483 ON sy.id = syv.sediment_load_id 1513 ON sy.id = syv.sediment_load_id
1484 JOIN measurement_station ms 1514 JOIN measurement_station ms
1544 <dc:call-macro name="epoch-load_ls"/> 1574 <dc:call-macro name="epoch-load_ls"/>
1545 </dc:call-macro> 1575 </dc:call-macro>
1546 </dc:context> 1576 </dc:context>
1547 </epochs> 1577 </epochs>
1548 </sediment_load_ls> 1578 </sediment_load_ls>
1549 </yields> 1579 </sedimentloads>
1550 </dc:macro> 1580 </dc:macro>
1551 1581
1552 1582
1553 <dc:macro name="basedata_5_flood-protections"> 1583 <dc:macro name="basedata_5_flood-protections">
1554 <dc:filter expr="$kind=5"> 1584 <dc:filter expr="$kind=5">
http://dive4elements.wald.intevation.org