Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8963:b98fbd91f64a
Configured SINFO-zusätzlich selektierte Längsschnitte in datacage
author | gernotbelger |
---|---|
date | Wed, 28 Mar 2018 17:04:20 +0200 |
parents | 8a1c6e2ad48b |
children | b194fa64506a |
comparison
equal
deleted
inserted
replaced
8962:708f210ff242 | 8963:b98fbd91f64a |
---|---|
272 <dc:call-macro name="basedata_7_waterlevels"/> | 272 <dc:call-macro name="basedata_7_waterlevels"/> |
273 </fixanalysis> | 273 </fixanalysis> |
274 </minfo> | 274 </minfo> |
275 <dc:call-macro name="basedata_3_officials"/> | 275 <dc:call-macro name="basedata_3_officials"/> |
276 <dc:call-macro name="basedata_2_fixations"/> | 276 <dc:call-macro name="basedata_2_fixations"/> |
277 <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> | 277 <sinfo> |
278 <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> | 278 <sinfo_additional_ls> |
279 <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> | |
280 <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> | |
281 </sinfo_additional_ls> | |
282 </sinfo> | |
279 </dc:when> | 283 </dc:when> |
280 | 284 |
281 <dc:when test="$out = 'sinfo_flow_depth'"> | 285 <dc:when test="$out = 'sinfo_flow_depth'"> |
282 <dc:call-macro name="longitudinal-section-prototype"/> | 286 <dc:call-macro name="longitudinal-section-prototype"/> |
283 </dc:when> | 287 </dc:when> |
1297 </dc:macro> | 1301 </dc:macro> |
1298 | 1302 |
1299 <dc:macro name="basedata_1_additionals-sinfo-with-q_macro"> | 1303 <dc:macro name="basedata_1_additionals-sinfo-with-q_macro"> |
1300 <dc:filter expr="$kind=1 and $sinfo_selection='Q'"> | 1304 <dc:filter expr="$kind=1 and $sinfo_selection='Q'"> |
1301 <dc:if test="dc:has-result()"> | 1305 <dc:if test="dc:has-result()"> |
1302 <additionals> | 1306 <sinfo_additional_ls_withQ> |
1303 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> | 1307 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> |
1304 <additional name="{dc:group-key()}"> | 1308 <additional name="{dc:group-key()}"> |
1305 <dc:for-each> | 1309 <dc:for-each> |
1306 <dc:macro-body/> | 1310 <dc:macro-body/> |
1307 </dc:for-each> | 1311 </dc:for-each> |
1308 </additional> | 1312 </additional> |
1309 </dc:group> | 1313 </dc:group> |
1310 </additionals> | 1314 </sinfo_additional_ls_withQ> |
1311 </dc:if> | 1315 </dc:if> |
1312 </dc:filter> | 1316 </dc:filter> |
1313 </dc:macro> | 1317 </dc:macro> |
1314 | 1318 |
1315 <dc:macro name="basedata_1_additionals-sinfo-with-q"> | 1319 <dc:macro name="basedata_1_additionals-sinfo-with-q"> |
1319 </dc:macro> | 1323 </dc:macro> |
1320 | 1324 |
1321 <dc:macro name="basedata_1_additionals-sinfo-without-q_macro"> | 1325 <dc:macro name="basedata_1_additionals-sinfo-without-q_macro"> |
1322 <dc:filter expr="$kind=1 and $sinfo_selection='W'"> | 1326 <dc:filter expr="$kind=1 and $sinfo_selection='W'"> |
1323 <dc:if test="dc:has-result()"> | 1327 <dc:if test="dc:has-result()"> |
1324 <additionals> | 1328 <sinfo_additional_ls_withoutQ> |
1325 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> | 1329 <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> |
1326 <additional name="{dc:group-key()}"> | 1330 <additional name="{dc:group-key()}"> |
1327 <dc:for-each> | 1331 <dc:for-each> |
1328 <dc:macro-body/> | 1332 <dc:macro-body/> |
1329 </dc:for-each> | 1333 </dc:for-each> |
1330 </additional> | 1334 </additional> |
1331 </dc:group> | 1335 </dc:group> |
1332 </additionals> | 1336 </sinfo_additional_ls_withoutQ> |
1333 </dc:if> | 1337 </dc:if> |
1334 </dc:filter> | 1338 </dc:filter> |
1335 </dc:macro> | 1339 </dc:macro> |
1336 | 1340 |
1337 <dc:macro name="basedata_1_additionals-sinfo-without-q"> | 1341 <dc:macro name="basedata_1_additionals-sinfo-without-q"> |
1338 <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro"> | 1342 <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro"> |
1339 <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> | 1343 <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> |
1340 </dc:call-macro> | 1344 </dc:call-macro> |
1341 </dc:macro> | 1345 </dc:macro> |
1342 | 1346 |
1343 <dc:macro name="basedata_1_additionals_wq"> | 1347 <dc:macro name="basedata_1_additionals_wq"> |
1344 <dc:call-macro name="basedata_1_additionals_macro"> | 1348 <dc:call-macro name="basedata_1_additionals_macro"> |
1604 <dc:call-macro name="flow_velocity_models"/> | 1608 <dc:call-macro name="flow_velocity_models"/> |
1605 </flow_velocities> | 1609 </flow_velocities> |
1606 </minfo> | 1610 </minfo> |
1607 | 1611 |
1608 <sinfo> | 1612 <sinfo> |
1613 <sinfo_additional_ls> | |
1614 <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> | |
1615 <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> | |
1616 </sinfo_additional_ls> | |
1617 | |
1609 <bed_heights_minmax> | 1618 <bed_heights_minmax> |
1610 <dc:call-macro name="minfo-heights-max"/> | 1619 <dc:call-macro name="minfo-heights-max"/> |
1611 <dc:call-macro name="minfo-heights-min"/> | 1620 <dc:call-macro name="minfo-heights-min"/> |
1612 </bed_heights_minmax> | 1621 </bed_heights_minmax> |
1613 </sinfo> | 1622 </sinfo> |
2071 </dc:context> | 2080 </dc:context> |
2072 </dc:macro> | 2081 </dc:macro> |
2073 | 2082 |
2074 <dc:macro name="bed-heights-statement"> | 2083 <dc:macro name="bed-heights-statement"> |
2075 <dc:statement> | 2084 <dc:statement> |
2076 SELECT bhs.id AS bedh_id, | 2085 SELECT bhs.id AS bedh_id, |
2077 bhs.year AS bedh_year, | 2086 bhs.year AS bedh_year, |
2078 bhs.description AS bedh_descr, | 2087 bhs.description AS bedh_descr, |
2079 bhs.description || '<BR>Jahr: ' || bhs.year || | 2088 bhs.description || '<BR>Jahr: ' || bhs.year || |
2080 '<BR>Aufnahmeart: ' || bht.name || | 2089 '<BR>Aufnahmeart: ' || bht.name || |
2081 '<BR>Lagesystem: ' || ls.name || | 2090 '<BR>Lagesystem: ' || ls.name || |
2082 '<BR>Höhensystem: ' || cur_em.name || | 2091 '<BR>Höhensystem: ' || cur_em.name || |
2083 '<BR>ursprüngliches Höhensystem: ' || old_em.name || | 2092 '<BR>ursprüngliches Höhensystem: ' || old_em.name || |
2084 '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || | 2093 '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) || |
2085 '<BR>Auswerter: ' || bhs.evaluation_by AS info, | 2094 '<BR>Auswerter: ' || bhs.evaluation_by AS info, |
2086 bhv.height_count AS bedh_height_count, | 2095 bhv.height_count AS bedh_height_count, |
2087 bhv.min_count AS bedh_min_count, | 2096 bhv.min_count AS bedh_min_count, |
2088 bhv.max_count AS bedh_max_count | 2097 bhv.max_count AS bedh_max_count |
2089 FROM bed_height bhs | 2098 FROM bed_height bhs |
2090 JOIN bed_height_type bht ON bht.id = bhs.type_id | 2099 JOIN bed_height_type bht ON bht.id = bhs.type_id |
2091 JOIN location_system ls ON ls.id = location_system_id | 2100 JOIN location_system ls ON ls.id = location_system_id |
2092 JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id | 2101 JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id |
2093 LEFT JOIN elevation_model old_em | 2102 LEFT JOIN elevation_model old_em |
2094 ON old_em.id = old_elevation_model_id | 2103 ON old_em.id = old_elevation_model_id |
2095 LEFT JOIN ranges r ON r.id = range_id | 2104 LEFT JOIN ranges r ON r.id = range_id |
2096 LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height) AS max_count | 2105 LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height) AS max_count |
2097 FROM bed_height_values GROUP BY bed_height_id | 2106 FROM bed_height_values GROUP |
2098 ) bhv ON bhs.id = bhv.bed_height_id | 2107 BY bed_height_id |
2099 WHERE bhs.river_id = ${river_id} | 2108 ) bhv ON bhs.id = bhv.bed_height_id |
2109 WHERE bhs.river_id = ${river_id} | |
2100 </dc:statement> | 2110 </dc:statement> |
2101 </dc:macro> | 2111 </dc:macro> |
2102 | 2112 |
2103 <!-- flow velocity --> | 2113 <!-- flow velocity --> |
2104 <dc:macro name="flow_velocity_models"> | 2114 <dc:macro name="flow_velocity_models"> |