# HG changeset patch
# User gernotbelger
# Date 1520440564 -3600
# Node ID a9950a3a71e514e3aa376816eddc207384dacce6
# Parent 82998242ba84bdc27d5c18a9c8829ae2d181b524
SINFO - tkh, configured result facets and themes
Configured datacages
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/artifacts/sinfo.xml Wed Mar 07 17:36:04 2018 +0100
@@ -59,10 +59,10 @@
-
-
+
+
-
+
@@ -124,11 +124,15 @@
-
+
+
-
-
+
+
+
+
+
@@ -144,13 +148,7 @@
-
-
-
-
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml
--- a/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Wed Mar 07 17:36:04 2018 +0100
@@ -47,6 +47,9 @@
+
+
+
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/meta-data.xml Wed Mar 07 17:36:04 2018 +0100
@@ -117,7 +117,7 @@
-
+
@@ -262,12 +262,14 @@
-
+
-
-
+
+
+
+
@@ -351,6 +353,9 @@
+
+
+
Discharge curves
@@ -748,13 +753,11 @@
-
-
@@ -774,7 +777,7 @@
-
+
@@ -791,7 +794,7 @@
-
+
@@ -811,27 +814,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -977,7 +980,8 @@
-
-
-
-
-
-
+
@@ -1116,8 +1113,7 @@
-
+
@@ -1128,35 +1124,35 @@
- SELECT g.name AS gauge_name,
- dt.id AS dt_id,
- t.start_time AS start_time,
- t.stop_time AS stop_time,
- dt.bfg_id AS bfg_id,
- dt.kind AS kind
- FROM gauges g
- JOIN discharge_tables dt ON g.id = dt.gauge_id
- LEFT JOIN time_intervals t ON dt.time_interval_id = t.id
- WHERE g.river_id = ${river_id}
- AND g.station BETWEEN ${fromkm} AND ${tokm}
- ORDER BY start_time
+ SELECT g.name AS gauge_name,
+ dt.id AS dt_id,
+ t.start_time AS start_time,
+ t.stop_time AS stop_time,
+ dt.bfg_id AS bfg_id,
+ dt.kind AS kind
+ FROM gauges g
+ JOIN discharge_tables dt ON g.id = dt.gauge_id
+ LEFT JOIN time_intervals t ON dt.time_interval_id = t.id
+ WHERE g.river_id = ${river_id}
+ AND g.station BETWEEN ${fromkm} AND ${tokm}
+ ORDER BY start_time
- SELECT g.name AS gauge_name,
- dt.id AS dt_id,
- t.start_time AS start_time,
- t.stop_time AS stop_time,
- dt.bfg_id AS bfg_id,
- dt.kind AS kind
- FROM gauges g
- JOIN discharge_tables dt ON g.id = dt.gauge_id
- LEFT JOIN time_intervals t ON dt.time_interval_id = t.id
- WHERE g.river_id = ${river_id}
- AND g.official_number = ${refgauge}
- ORDER BY start_time
+ SELECT g.name AS gauge_name,
+ dt.id AS dt_id,
+ t.start_time AS start_time,
+ t.stop_time AS stop_time,
+ dt.bfg_id AS bfg_id,
+ dt.kind AS kind
+ FROM gauges g
+ JOIN discharge_tables dt ON g.id = dt.gauge_id
+ LEFT JOIN time_intervals t ON dt.time_interval_id = t.id
+ WHERE g.river_id = ${river_id}
+ AND g.official_number = ${refgauge}
+ ORDER BY start_time
@@ -1166,17 +1162,15 @@
SELECT DISTINCT
- cs.id AS prot_id,
- cs.description AS prot_description
+ cs.id AS prot_id,
+ cs.description AS prot_description
FROM cross_sections cs
- JOIN cross_section_lines csl ON csl.cross_section_id = cs.id
+ JOIN cross_section_lines csl ON csl.cross_section_id = cs.id
WHERE cs.river_id = ${river_id}
- AND csl.km BETWEEN ${fromkm} AND ${tokm}
+ AND csl.km BETWEEN ${fromkm} AND ${tokm}
-
+
@@ -1187,17 +1181,15 @@
SELECT DISTINCT
- h.id AS hyk_id,
- h.description AS hyk_description
+ h.id AS hyk_id,
+ h.description AS hyk_description
FROM hyks h
- JOIN hyk_entries he ON he.hyk_id = h.id
+ JOIN hyk_entries he ON he.hyk_id = h.id
WHERE river_id = ${river_id}
- AND he.km BETWEEN ${fromkm} AND ${tokm}
+ AND he.km BETWEEN ${fromkm} AND ${tokm}
-
+
@@ -1225,19 +1217,13 @@
-
+
-
+
@@ -1260,28 +1246,19 @@
-
+
-
+
-
+
@@ -1304,28 +1281,19 @@
-
+
-
+
-
+
@@ -1348,21 +1316,13 @@
-
+
-
+
@@ -1385,28 +1345,19 @@
-
+
-
+
-
+
@@ -1429,28 +1380,19 @@
-
+
-
+
-
+
@@ -1464,11 +1406,7 @@
-
+
@@ -1479,10 +1417,7 @@
-
+
@@ -1512,19 +1447,13 @@
-
+
-
+
@@ -1532,21 +1461,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1570,20 +1499,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1600,93 +1529,81 @@
-
+
SINFO
+
+
+
+
-
-
+
+
SELECT DISTINCT
- p.id AS pid,
- p.description AS description,
- d.lower AS depth_lower,
- d.upper AS depth_upper,
- p.description || '<BR>' ||
- 'Tiefe: ' || d.lower || ' - ' || d.upper
- || ' cm <BR>' ||
- 'Zeitraum: ' AS info,
- t.start_time AS syear,
- t.stop_time AS eyear
- FROM porosity p
- JOIN depths d ON p.depth_id = d.id
- JOIN time_intervals t ON p.time_interval_id=t.id
- WHERE p.river_id = ${river_id}
+ p.id AS pid,
+ p.description AS description,
+ d.lower AS depth_lower,
+ d.upper AS depth_upper,
+ p.description || '<BR>' ||
+ 'Tiefe: ' || d.lower || ' - ' || d.upper
+ || ' cm <BR>' ||
+ 'Zeitraum: ' AS info,
+ t.start_time AS syear,
+ t.stop_time AS eyear
+ FROM porosity p
+ JOIN depths d ON p.depth_id = d.id
+ JOIN time_intervals t ON p.time_interval_id=t.id
+ WHERE p.river_id = ${river_id}
ORDER BY depth_lower, depth_upper
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
SELECT DISTINCT
- sd.id AS sdid,
- d.lower AS depth_lower,
- d.upper AS depth_upper,
- min(sdv.year) AS year,
- sd.description || '<BR>Jahr: ' || min(sdv.year) AS info
- FROM sediment_density sd
- JOIN depths d ON sd.depth_id = d.id
- JOIN sediment_density_values sdv on sdv.sediment_density_id = sd.id
- WHERE sd.river_id = ${river_id}
+ sd.id AS sdid,
+ d.lower AS depth_lower,
+ d.upper AS depth_upper,
+ min(sdv.year) AS year,
+ sd.description || '<BR>Jahr: ' || min(sdv.year) AS info
+ FROM sediment_density sd
+ JOIN depths d ON sd.depth_id = d.id
+ JOIN sediment_density_values sdv on sdv.sediment_density_id = sd.id
+ WHERE sd.river_id = ${river_id}
GROUP BY sd.id, sd.description, d.upper, d.lower
ORDER BY year, depth_lower, depth_upper
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
@@ -1695,25 +1612,21 @@
dc:date-format('yyyy', $sqstop))">
-
+
-
+
-
-
@@ -1728,18 +1641,18 @@
+ $kind != 'official'">
+ $kind != 'official'">
-
+
@@ -1774,63 +1687,64 @@
SELECT DISTINCT
- sl.id AS slid,
- slk.kind AS kind,
- ti.start_time AS startyear,
- ti.stop_time AS endyear,
- sq.start_time AS sqstart,
- sq.stop_time AS sqstop,
- sq.id AS sqid,
- gf.name AS fraction,
- sl.description || '<BR>' ||
- 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
- ' mm<BR>Einheit: t/a' AS info
- FROM sediment_load sl
- JOIN sediment_load_kinds slk ON slk.id = sl.kind
- JOIN sediment_load_values slv
- ON sl.id = slv.sediment_load_id
- JOIN measurement_station ms
- ON ms.id = slv.measurement_station_id
- JOIN ranges ra ON ms.range_id = ra.id
- JOIN rivers r ON ra.river_id = r.id
- JOIN time_intervals ti ON sl.time_interval_id = ti.id
- LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id
- JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
+ sl.id AS slid,
+ slk.kind AS kind,
+ ti.start_time AS startyear,
+ ti.stop_time AS endyear,
+ sq.start_time AS sqstart,
+ sq.stop_time AS sqstop,
+ sq.id AS sqid,
+ gf.name AS fraction,
+ sl.description || '<BR>' ||
+ 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
+ ' mm<BR>Einheit: t/a' AS info
+ FROM sediment_load sl
+ JOIN sediment_load_kinds slk ON slk.id = sl.kind
+ JOIN sediment_load_values slv
+ ON sl.id = slv.sediment_load_id
+ JOIN measurement_station ms
+ ON ms.id =
+ slv.measurement_station_id
+ JOIN ranges ra ON ms.range_id = ra.id
+ JOIN rivers r ON ra.river_id = r.id
+ JOIN time_intervals ti ON sl.time_interval_id = ti.id
+ LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id
+ JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
WHERE r.id = ${river_id}
- AND CASE WHEN r.km_up = 1 AND ra.b IS NOT NULL
- THEN ra.b ELSE ra.a END BETWEEN ${fromkm} AND ${tokm}
- ORDER BY sqstart DESC, sqstop DESC,
- fraction, startyear DESC, endyear DESC
+ AND CASE WHEN r.km_up = 1 AND ra.b IS NOT NULL
+ THEN ra.b ELSE ra.a END BETWEEN ${fromkm} AND ${tokm}
+ ORDER BY sqstart DESC, sqstop DESC,
+ fraction, startyear DESC, endyear DESC
SELECT DISTINCT
- sl.id AS slid,
- slk.kind AS kind,
- ti.start_time AS startyear,
- ti.stop_time AS endyear,
- sq.start_time AS sqstart,
- sq.stop_time AS sqstop,
- sq.id AS sqid,
- gf.name AS fraction,
- sl.description || '<BR>' ||
- 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
- ' mm<BR>Einheit: ' || u.name AS info
- FROM sediment_load_ls sl
- JOIN sediment_load_kinds slk ON slk.id = sl.kind
- JOIN rivers r ON sl.river_id = r.id
- JOIN sediment_load_ls_values slv
- ON sl.id = slv.sediment_load_ls_id
- JOIN time_intervals ti ON sl.time_interval_id = ti.id
- LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id
- JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
- JOIN units u ON sl.unit_id = u.id
- WHERE r.id = ${river_id}
- AND slv.station BETWEEN ${fromkm} AND ${tokm}
+ sl.id AS slid,
+ slk.kind AS kind,
+ ti.start_time AS startyear,
+ ti.stop_time AS endyear,
+ sq.start_time AS sqstart,
+ sq.stop_time AS sqstop,
+ sq.id AS sqid,
+ gf.name AS fraction,
+ sl.description || '<BR>' ||
+ 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
+ ' mm<BR>Einheit: ' || u.name AS info
+ FROM sediment_load_ls sl
+ JOIN sediment_load_kinds slk ON slk.id = sl.kind
+ JOIN rivers r ON sl.river_id = r.id
+ JOIN sediment_load_ls_values slv
+ ON sl.id = slv.sediment_load_ls_id
+ JOIN time_intervals ti ON sl.time_interval_id = ti.id
+ LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id
+ JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id
+ JOIN units u ON sl.unit_id = u.id
+ WHERE r.id = ${river_id}
+ AND slv.station BETWEEN ${fromkm} AND ${tokm}
ORDER BY sqstart DESC, sqstop DESC,
- fraction, startyear DESC, endyear DESC
+ fraction, startyear DESC, endyear DESC
@@ -1842,16 +1756,14 @@
-
+
- SELECT id AS anno_id,
- name AS anno_description
+ SELECT id AS anno_id,
+ name AS anno_description
FROM annotation_types
-
+
@@ -1861,30 +1773,28 @@
- SELECT id AS anno_id,
- name AS anno_description
+ SELECT id AS anno_id,
+ name AS anno_description
FROM annotation_types
- WHERE name LIKE 'Quelle %' OR name LIKE 'Senke %'
+ WHERE name LIKE 'Quelle %' OR name LIKE 'Senke %'
-
+
-
+
-
+
-
+
@@ -1892,32 +1802,33 @@
- WITH sta
- AS (SELECT bhs.id,
- bhs.description,
- bhsv.station,
- bhs.year
- FROM bed_height bhs
- JOIN bed_height_values bhsv
- ON bhsv.bed_height_id = bhs.id
- WHERE bhs.river_id = ${river_id}
- AND bhsv.station BETWEEN ${fromkm} AND ${tokm}),
- csta
- AS (SELECT b1.id AS b1id,
- b1.description AS b1desc,
- b1.year AS b1year,
- b2.id AS b2id,
- b2.description AS b2desc,
- b2.year AS b2year
- FROM sta b1
- JOIN sta b2
- ON b1.station = b2.station
- AND b1.id <> b2.id
- AND (b1.year > b2.year OR b1.year IS NULL))
- SELECT DISTINCT b1id, b1desc, b1year,
- b2id, b2desc, b2year
- FROM csta
- ORDER BY b1desc, b2desc
+ WITH sta
+ AS (SELECT bhs.id,
+ bhs.description,
+ bhsv.station,
+ bhs.year
+ FROM bed_height bhs
+ JOIN bed_height_values bhsv
+ ON bhsv.bed_height_id = bhs.id
+ WHERE bhs.river_id = ${river_id}
+ AND bhsv.station BETWEEN ${fromkm} AND ${tokm}),
+ csta
+ AS (SELECT b1.id AS b1id,
+ b1.description AS b1desc,
+ b1.year AS b1year,
+ b2.id AS b2id,
+ b2.description AS b2desc,
+ b2.year AS b2year
+ FROM sta b1
+ JOIN sta b2
+ ON b1.station = b2.station
+ AND b1.id <> b2.id
+ AND (b1.year > b2.year OR b1.year IS NULL))
+ SELECT
+ DISTINCT b1id, b1desc, b1year,
+ b2id, b2desc, b2year
+ FROM csta
+ ORDER BY b1desc, b2desc
@@ -1950,23 +1861,11 @@
-
+
-
-
+
+
@@ -1983,11 +1882,7 @@
-
+
@@ -2021,11 +1916,7 @@
-
+
@@ -2051,23 +1942,24 @@
- SELECT bhs.id AS bedh_id,
- bhs.year AS bedh_year,
- bhs.description AS bedh_descr,
- bhs.description || '<BR>Jahr: ' || bhs.year ||
- '<BR>Aufnahmeart: ' || bht.name ||
- '<BR>Lagesystem: ' || ls.name ||
- '<BR>Höhensystem: ' || cur_em.name ||
- '<BR>ursprüngliches Höhensystem: ' || old_em.name ||
- '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) ||
- '<BR>Auswerter: ' || bhs.evaluation_by AS info
+ SELECT bhs.id AS bedh_id,
+ bhs.year AS bedh_year,
+ bhs.description AS bedh_descr,
+ bhs.description || '<BR>Jahr: ' || bhs.year ||
+ '<BR>Aufnahmeart: ' || bht.name ||
+ '<BR>Lagesystem: ' || ls.name ||
+ '<BR>Höhensystem: ' || cur_em.name ||
+ '<BR>ursprüngliches Höhensystem: ' || old_em.name ||
+ '<BR>Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) ||
+ '<BR>Auswerter: ' || bhs.evaluation_by AS info
FROM bed_height bhs
- JOIN bed_height_type bht ON bht.id = bhs.type_id
- JOIN location_system ls ON ls.id = location_system_id
- JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id
- LEFT JOIN elevation_model old_em
- ON old_em.id = old_elevation_model_id
- LEFT JOIN ranges r ON r.id = range_id
+ JOIN bed_height_type bht ON bht.id =
+ bhs.type_id
+ JOIN location_system ls ON ls.id = location_system_id
+ JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id
+ LEFT JOIN elevation_model old_em
+ ON old_em.id = old_elevation_model_id
+ LEFT JOIN ranges r ON r.id = range_id
WHERE bhs.river_id = ${river_id}
@@ -2076,12 +1968,12 @@
- SELECT fvm.id AS fvmid,
- fvm.description AS fvmd,
- dz.gauge_name AS gauge,
- dz.value AS q,
- dz.upper_discharge AS upperQ,
- dz.lower_discharge AS lowerQ
+ SELECT fvm.id AS fvmid,
+ fvm.description AS fvmd,
+ dz.gauge_name AS gauge,
+ dz.value AS q,
+ dz.upper_discharge AS upperQ,
+ dz.lower_discharge AS lowerQ
FROM flow_velocity_model fvm
JOIN discharge_zone dz ON dz.id = fvm.discharge_zone_id
WHERE dz.river_id = ${river_id}
@@ -2090,13 +1982,9 @@
-
+ Q = {$q} m3/s" target_out="{$out}"/>
@@ -2107,8 +1995,8 @@
- SELECT id AS fvmid,
- description AS fvmd
+ SELECT id AS fvmid,
+ description AS fvmd
FROM flow_velocity_measurements WHERE river_id = ${river_id}
@@ -2120,12 +2008,10 @@
SELECT id, description, station, datetime, v, w, q
FROM flow_velocity_measure_values
WHERE measurements_id = ${fvmid}
- AND station BETWEEN ${fromkm} AND ${tokm}
+ AND station BETWEEN ${fromkm} AND ${tokm}
-
+
@@ -2138,7 +2024,7 @@
- SELECT id AS width_id
+ SELECT id AS width_id
FROM morphologic_width
WHERE river_id = ${river_id}
@@ -2148,14 +2034,12 @@
SELECT min(station) AS from_station,
- max(station) AS to_station
+ max(station) AS to_station
FROM morphologic_width_values
WHERE morphologic_width_id = ${width_id}
-
+
@@ -2168,12 +2052,12 @@
SELECT
- ti.start_time AS start_time,
- ti.stop_time AS stop_time,
- ms.name AS station_name,
- lower(sqv.parameter) AS parameter,
- sqv.id AS sqvid,
- ra.a AS station_km
+ ti.start_time AS start_time,
+ ti.stop_time AS stop_time,
+ ms.name AS station_name,
+ lower(sqv.parameter) AS parameter,
+ sqv.id AS sqvid,
+ ra.a AS station_km
FROM sq_relation sq
JOIN time_intervals ti ON ti.id = sq.time_interval_id
JOIN sq_relation_value sqv ON sqv.sq_relation_id = sq.id
@@ -2192,15 +2076,11 @@
$station_name)">
-
-
+
@@ -2250,28 +2130,25 @@
- SELECT d.id AS dem_id,
- r.a AS dem_lower,
- r.b AS dem_upper,
- d.name AS name,
- t.start_time AS start_time,
- t.stop_time AS stop_time,
- 'Projektion: ' || d.projection || '<BR>' ||
- 'Rasterweite: ' || d.resolution || 'm<BR>' ||
- 'Format: ' || d.format || '<BR>' ||
- 'Zeitraum: '
- AS info
+ SELECT d.id AS dem_id,
+ r.a AS dem_lower,
+ r.b AS dem_upper,
+ d.name AS name,
+ t.start_time AS start_time,
+ t.stop_time AS stop_time,
+ 'Projektion: ' || d.projection || '<BR>' ||
+ 'Rasterweite: ' || d.resolution || 'm<BR>' ||
+ 'Format: ' || d.format || '<BR>' ||
+ 'Zeitraum: '
+ AS info
FROM dem d
- JOIN ranges r ON d.range_id = r.id
- LEFT JOIN time_intervals t ON d.time_interval_id = t.id
- WHERE d.river_id = ${river_id}
- AND NOT((${tokm} < r.a) or (${fromkm} > r.b))
-
-
-
+ JOIN ranges r ON d.range_id = r.id
+ LEFT JOIN time_intervals t ON d.time_interval_id = t.id
+ WHERE d.river_id = ${river_id}
+ AND NOT((${tokm} < r.a) or (${fromkm} > r.b))
+
+
+
@@ -2281,25 +2158,31 @@
-
+
-
+
+
+
-
+
+
+
-
+
+
+
@@ -2325,9 +2208,9 @@
SELECT DISTINCT
- name AS hws_name,
+ name AS hws_name,
official AS hws_official,
- kind_id AS hws_kind
+ kind_id AS hws_kind
FROM hws_lines
WHERE river_id = ${river_id}
@@ -2343,9 +2226,9 @@
SELECT DISTINCT
- name AS hws_name,
+ name AS hws_name,
official AS hws_official,
- kind_id AS hws_kind
+ kind_id AS hws_kind
FROM hws_points
WHERE river_id = ${river_id}
@@ -2362,29 +2245,25 @@
SELECT DISTINCT
- name
+ name
FROM hydr_boundaries
WHERE river_id = ${river_id}
- AND kind = 2
+ AND kind = 2
-
+
SELECT DISTINCT
- name
+ name
FROM hydr_boundaries_poly
WHERE river_id = ${river_id}
- AND kind = 2
+ AND kind = 2
-
+
@@ -2394,18 +2273,16 @@
SELECT DISTINCT
- name
+ name
FROM hydr_boundaries
WHERE river_id = ${river_id}
- AND kind = 1
+ AND kind = 1
What about all other line kinds?
-
+
@@ -2417,19 +2294,17 @@
SELECT DISTINCT
- b.sectie AS sectie_id,
- sk.name AS sectie
+ b.sectie AS sectie_id,
+ sk.name AS sectie
FROM hydr_boundaries_poly b
- JOIN sectie_kinds sk ON b.sectie = sk.id
+ JOIN sectie_kinds sk ON b.sectie = sk.id
WHERE b.river_id = ${river_id}
- AND b.kind = 1
+ AND b.kind = 1
-
+
@@ -2437,19 +2312,17 @@
SELECT DISTINCT
- b.sobek AS sobek_id,
- sk.name AS sobek
+ b.sobek AS sobek_id,
+ sk.name AS sobek
FROM hydr_boundaries_poly b
- JOIN sobek_kinds sk ON b.sobek = sk.id
+ JOIN sobek_kinds sk ON b.sobek = sk.id
WHERE b.river_id = ${river_id}
- AND b.kind = 1
+ AND b.kind = 1
-
+
@@ -2457,17 +2330,15 @@
SELECT DISTINCT
- b.name AS name
+ b.name AS name
FROM hydr_boundaries_poly b
WHERE b.river_id = ${river_id}
- AND b.kind = 1
- AND b.sobek IS NULL
- AND b.sectie is NULL
+ AND b.kind = 1
+ AND b.sobek IS NULL
+ AND b.sectie is NULL
-
+
@@ -2479,126 +2350,116 @@
SELECT DISTINCT 1 FROM floodmaps WHERE river_id = ${river_id}
-
-
-
-
- SELECT DISTINCT 1 FROM floodmaps WHERE river_id = ${river_id}
- AND (kind = 112 OR kind = 111)
-
-
-
-
-
- SELECT DISTINCT name AS name
- FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 111
-
-
-
-
-
-
-
-
-
-
-
- SELECT DISTINCT name AS name
- FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 112
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SELECT DISTINCT 1 from floodmaps where river_id = ${river_id}
- AND (kind = 122 OR kind = 121)
-
-
-
-
-
- SELECT DISTINCT name AS name
- FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 121
-
-
-
-
-
-
-
-
-
-
-
- SELECT DISTINCT
- name AS name
- FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 122
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SELECT DISTINCT
- source AS source
- FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 200
-
-
-
-
-
+
+
+
+
+ SELECT DISTINCT 1 FROM floodmaps WHERE river_id = ${river_id}
+ AND (kind = 112 OR kind = 111)
+
+
+
+
+
+ SELECT DISTINCT name AS name
+ FROM floodmaps
+ WHERE river_id = ${river_id} AND kind = 111
+
+
+
+
+
+
+
+
+
+
+
+ SELECT DISTINCT name AS name
+ FROM floodmaps
+ WHERE river_id = ${river_id} AND kind = 112
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT DISTINCT 1 from floodmaps where river_id = ${river_id}
+ AND (kind = 122 OR kind = 121)
+
+
+
+
+
+ SELECT DISTINCT name AS name
+ FROM floodmaps
+ WHERE river_id = ${river_id} AND kind = 121
+
+
+
+
+
+
+
+
+
SELECT DISTINCT
- name AS name
+ name AS name
FROM floodmaps
- WHERE river_id = ${river_id} AND kind = 200 AND source =
- ${source}
+ WHERE river_id = ${river_id} AND kind = 122
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+ SELECT DISTINCT
+ source AS source
+ FROM floodmaps
+ WHERE river_id = ${river_id} AND kind = 200
+
+
+
+
+
+
+
+ SELECT DISTINCT
+ name AS name
+ FROM floodmaps
+ WHERE river_id = ${river_id} AND kind = 200 AND source =
+ ${source}
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2606,28 +2467,24 @@
SELECT DISTINCT
- fp.kind_id AS kind_id,
- flk.name AS kind_name
+ fp.kind_id AS kind_id,
+ flk.name AS kind_name
FROM floodplain fp
- JOIN floodplain_kinds flk on fp.kind_id = flk.id
+ JOIN floodplain_kinds flk on fp.kind_id = flk.id
WHERE river_id = ${river_id}
-
+
-
+
@@ -2645,9 +2502,7 @@
-
+
@@ -2682,23 +2537,23 @@
SELECT DISTINCT
- fs.name AS fed_name,
- fs.id AS fed_id
+ fs.name AS fed_name,
+ fs.id AS fed_id
FROM hws_points hws
- JOIN fed_states fs ON hws.fed_state_id = fs.id
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
WHERE river_id = ${river_id}
- AND hws.official=1
+ AND hws.official=1
SELECT DISTINCT
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_points
WHERE river_id = ${river_id}
- AND official=1
- AND fed_state_id = ${fed_id} ORDER BY name
+ AND official=1
+ AND fed_state_id = ${fed_id} ORDER BY name
@@ -2709,13 +2564,13 @@
SELECT distinct
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_points
WHERE river_id = ${river_id}
- AND official=1
- AND fed_state_id IS NULL
- ORDER BY name
+ AND official=1
+ AND fed_state_id IS NULL
+ ORDER BY name
@@ -2726,23 +2581,23 @@
SELECT DISTINCT
- fs.name AS fed_name,
- fs.id AS fed_id
+ fs.name AS fed_name,
+ fs.id AS fed_id
FROM hws_points hws
- JOIN fed_states fs ON hws.fed_state_id = fs.id
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
WHERE river_id = ${river_id}
- AND hws.official=0
+ AND hws.official=0
SELECT DISTINCT
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_points
WHERE river_id = ${river_id}
- AND official=0
- AND fed_state_id = ${fed_id} ORDER BY name
+ AND official=0
+ AND fed_state_id = ${fed_id} ORDER BY name
@@ -2753,12 +2608,12 @@
SELECT distinct
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_points
WHERE river_id = ${river_id}
- AND official=0
- AND fed_state_id IS NULL ORDER BY name
+ AND official=0
+ AND fed_state_id IS NULL ORDER BY name
@@ -2776,9 +2631,7 @@
-
+
@@ -2813,23 +2666,23 @@
SELECT DISTINCT
- fs.name AS fed_name,
- fs.id AS fed_id
+ fs.name AS fed_name,
+ fs.id AS fed_id
FROM hws_lines hws
- JOIN fed_states fs ON hws.fed_state_id = fs.id
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
WHERE river_id = ${river_id}
- AND hws.official=1
+ AND hws.official=1
SELECT DISTINCT
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_lines
WHERE river_id = ${river_id}
- AND official=1
- AND fed_state_id = ${fed_id} ORDER BY name
+ AND official=1
+ AND fed_state_id = ${fed_id} ORDER BY name
@@ -2840,13 +2693,13 @@
SELECT distinct
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_lines
WHERE river_id = ${river_id}
- AND official=1
- AND fed_state_id IS NULL
- ORDER BY name
+ AND official=1
+ AND fed_state_id IS NULL
+ ORDER BY name
@@ -2857,23 +2710,23 @@
SELECT DISTINCT
- fs.name AS fed_name,
- fs.id AS fed_id
+ fs.name AS fed_name,
+ fs.id AS fed_id
FROM hws_lines hws
- JOIN fed_states fs ON hws.fed_state_id = fs.id
+ JOIN fed_states fs ON hws.fed_state_id = fs.id
WHERE river_id = ${river_id}
- AND hws.official=0
+ AND hws.official=0
SELECT DISTINCT
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_lines
WHERE river_id = ${river_id}
- AND official=0
- AND fed_state_id = ${fed_id} ORDER BY name
+ AND official=0
+ AND fed_state_id = ${fed_id} ORDER BY name
@@ -2884,12 +2737,12 @@
SELECT distinct
- name AS hws_name,
- kind_id AS hws_kind
+ name AS hws_name,
+ kind_id AS hws_kind
FROM hws_lines
WHERE river_id = ${river_id}
- AND official=0
- AND fed_state_id IS NULL ORDER BY name
+ AND official=0
+ AND fed_state_id IS NULL ORDER BY name
@@ -2903,16 +2756,14 @@
SELECT DISTINCT
- COALESCE(CAST (year AS VARCHAR(64)), 'Unbekanntes Jahr') AS year
+ COALESCE(CAST (year AS VARCHAR(64)), 'Unbekanntes Jahr') AS year
FROM flood_marks
WHERE river_id = ${river_id}
-
+
@@ -2921,10 +2772,10 @@
-
-
-
-
+
+
+
+
@@ -2932,28 +2783,24 @@
SELECT DISTINCT
- ak.name AS kind_name,
- ax.kind_id AS kind_id,
- ax.name AS layer_name
+ ak.name AS kind_name,
+ ax.kind_id AS kind_id,
+ ax.name AS layer_name
FROM river_axes ax
- JOIN axis_kinds ak on ax.kind_id = ak.id
+ JOIN axis_kinds ak on ax.kind_id = ak.id
WHERE river_id = ${river_id}
-
+
-
+
@@ -2967,8 +2814,8 @@
SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id}
-
-
+
+
@@ -2979,11 +2826,10 @@
SELECT name AS name
FROM fixpoints
WHERE river_id = ${river_id}
- GROUP BY name
+ GROUP BY name
-
+
@@ -2992,29 +2838,25 @@
SELECT DISTINCT
- cs.kind_id AS kind_id,
- cs.name AS layer_name,
- ck.name AS kind_name
+ cs.kind_id AS kind_id,
+ cs.name AS layer_name,
+ ck.name AS kind_name
FROM cross_section_tracks cs
- JOIN cross_section_track_kinds ck ON cs.kind_id = ck.id
+ JOIN cross_section_track_kinds ck ON cs.kind_id = ck.id
WHERE river_id = ${river_id}
-
+
-
+
@@ -3029,27 +2871,23 @@
SELECT DISTINCT
- b.name AS building_name,
- bk.name AS building_kind,
- b.kind_id AS building_kind_id
+ b.name AS building_name,
+ bk.name AS building_kind,
+ b.kind_id AS building_kind_id
FROM buildings b
- JOIN building_kinds bk ON b.kind_id = bk.id
+ JOIN building_kinds bk ON b.kind_id = bk.id
WHERE river_id = ${river_id}
-
+
-
+
@@ -3058,18 +2896,16 @@
SELECT DISTINCT
- j.kind_id AS jetty_kind_id,
- jk.name AS jetty_kind
+ j.kind_id AS jetty_kind_id,
+ jk.name AS jetty_kind
FROM jetties j
- JOIN jetty_kinds jk ON j.kind_id = jk.id
+ JOIN jetty_kinds jk ON j.kind_id = jk.id
WHERE river_id = ${river_id}
-
+
@@ -3088,9 +2924,7 @@
-
+
@@ -3101,19 +2935,14 @@
-
+
-
-
+
+
-
-
+
+
- SELECT w.kind AS kind,
- w.id AS wst_id,
- wc.id AS wst_column_id,
- wc.position AS wst_column_position,
- wc.description AS info,
- w.description AS wst_description,
- COALESCE(wc.name, '') AS wst_column_name,
- wr.a AS deffrom,
- wr.b AS defto
+ SELECT w.kind AS kind,
+ w.id AS wst_id,
+ wc.id AS wst_column_id,
+ wc.position AS wst_column_position,
+ wc.description AS info,
+ w.description AS wst_description,
+ COALESCE(wc.name, '') AS wst_column_name,
+ wr.a AS deffrom,
+ wr.b AS defto
FROM wst_columns wc
- JOIN wsts w ON wc.wst_id = w.id
- JOIN wst_ranges wr ON wc.id = wr.wst_column_id
+ JOIN wsts w ON wc.wst_id = w.id
+ JOIN wst_ranges wr ON wc.id = wr.wst_column_id
WHERE w.river_id = ${river_id} AND
- NOT((${tokm} < wr.a) or (${fromkm} > wr.b))
- ORDER BY wst_column_position
+ NOT((${tokm} < wr.a) or (${fromkm} > wr.b))
+ ORDER BY wst_column_position
-
- Select collections and masterartifacts.
- XXX: The cast is a quick hack because the ld_* values are
- now TEXT fields. To properly fix / asses the problems here
- an SLT evaluation is needed.
-
+
+ Select collections and masterartifacts.
+ XXX: The cast is a quick hack because the ld_* values are
+ now TEXT fields. To properly fix / asses the problems here
+ an SLT evaluation is needed.
+
- SELECT c.name AS collection_name,
- ma.id AS a_id,
- ma.state AS a_state,
- ma.gid AS a_gid,
- ma.creation AS a_creation,
- CAST(COALESCE(ma.ld_mode, '') AS VARCHAR(255)) AS ld_m,
- CAST(COALESCE(ma.ld_locations, '') AS VARCHAR(255)) AS ld_l,
- CAST(COALESCE(ma.ld_from, '') AS VARCHAR(255)) AS ld_f,
- CAST(COALESCE(ma.ld_to, '') AS VARCHAR(255)) AS ld_t,
- o.name AS out_name,
- o.id AS out_id,
- f.name AS facet_name,
- f.num AS facet_num,
- f.description AS facet_description,
- f.id AS fid
+ SELECT c.name AS collection_name,
+ ma.id AS a_id,
+ ma.state AS a_state,
+ ma.gid AS a_gid,
+ ma.creation AS a_creation,
+ CAST(COALESCE(ma.ld_mode, '') AS VARCHAR(255)) AS ld_m,
+ CAST(COALESCE(ma.ld_locations, '') AS VARCHAR(255)) AS ld_l,
+ CAST(COALESCE(ma.ld_from, '') AS VARCHAR(255)) AS ld_f,
+ CAST(COALESCE(ma.ld_to, '') AS VARCHAR(255)) AS ld_t,
+ o.name AS out_name,
+ o.id AS out_id,
+ f.name AS facet_name,
+ f.num AS facet_num,
+ f.description AS facet_description,
+ f.id AS fid
FROM users u
- JOIN collections c ON c.user_id = u.id
- JOIN master_artifacts_range ma ON ma.collection_id = c.id
- JOIN outs o ON o.artifact_id = ma.id
- JOIN facets f ON f.out_id = o.id
- WHERE u.gid = CAST(${user-id} AS UUID)
- AND ma.gid <> CAST(${artifact-id} AS uuid)
- AND f.name NOT LIKE '%empty.facet%'
- AND EXISTS (
- SELECT id
- FROM artifact_data ad
- WHERE ad.artifact_id = ma.id
- AND k = 'river'
- AND v = ${river})
+ JOIN
+ collections c ON c.user_id = u.id
+ JOIN master_artifacts_range ma ON ma.collection_id = c.id
+ JOIN outs o ON o.artifact_id = ma.id
+ JOIN facets f ON f.out_id = o.id
+ WHERE u.gid = CAST(${user-id} AS UUID)
+ AND ma.gid <> CAST(${artifact-id} AS uuid)
+ AND f.name NOT LIKE '%empty.facet%'
+ AND EXISTS (
+ SELECT id
+ FROM artifact_data ad
+ WHERE ad.artifact_id = ma.id
+ AND k = 'river'
+ AND v = ${river})
@@ -3231,27 +3061,21 @@
-
-
-
-
Inverting KM filter.
-
-
@@ -3260,7 +3084,8 @@
-
+
+
@@ -3283,7 +3108,7 @@
-
+
@@ -3305,5 +3130,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/themes.xml Wed Mar 07 17:36:04 2018 +0100
@@ -406,8 +406,12 @@
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/themes/default.xml Wed Mar 07 17:36:04 2018 +0100
@@ -2882,7 +2882,7 @@
-
+
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/themes/second.xml Wed Mar 07 17:36:04 2018 +0100
@@ -2871,7 +2871,7 @@
-
+
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java Wed Mar 07 17:36:04 2018 +0100
@@ -20,13 +20,12 @@
public final class D50Processor extends AbstractSInfoLineProcessor {
- // FIXME: translate!
- private static final String I18N_AXIS_LABEL = "sinfo.chart.d50.section.yaxis.label";
+ // FIXME: check: filtered or not?
+ public static final String FACET_TKH_D50_FILTERED = "sinfo_facet_d50.filtered";
- private static final String SINFO_CHART_D50_YAXIS_LABEL = "sinfo.chart.d50.yaxis.label";
+ private static final String I18N_AXIS_LABEL = "sinfo.chart.tkh_d50.section.yaxis.label";
- // FIXME: check: filtered or not?
- private static final String FACET_TKH_D50_FILTERED = "sinfo_tkh_d50.filtered";
+ private static final String SINFO_CHART_D50_YAXIS_LABEL = "sinfo.chart.tkh_d50.yaxis.label";
private static final String I18N_FACET_TKH_D50_FILTERED_DESCRIPTION = "sinfo.facet.tkh_d50.filtered.description";
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java Wed Mar 07 17:36:04 2018 +0100
@@ -27,13 +27,13 @@
/* Theme name, usually defined in 'FacetTypes', but that is soooo bad dependencies... */
// REMARK: these mustend with 'filtered' so extra handling happens in chart: point are always recalculated, because data
// changes depending on zoom state
- public static final String FACET_FLOW_DEPTH_FILTERED = "sinfo_flow_depth.filtered";
+ public static final String FACET_FLOW_DEPTH_FILTERED = "sinfo_facet_flow_depth.filtered";
private static final String I18N_FACET_FLOW_DEPTH_FILTERED_DESCRIPTION = "sinfo.facet.flow_depth.filtered.description";
- private static final String FACET_FLOW_DEPTH_TKH_FILTERED = "sinfo_flow_depth.tkh.filtered";
+ private static final String FACET_FLOW_DEPTH_TKH_FILTERED = "sinfo_facet_flow_depth_with_tkh.filtered";
- private static final String I18N_FACET_FLOW_DEPTH_TKH_FILTERED_DESCRIPTION = "sinfo.facet.flow_depth.tkh.filtered.description";
+ private static final String I18N_FACET_FLOW_DEPTH_TKH_FILTERED_DESCRIPTION = "sinfo.facet.flow_depth_with_tkh.filtered.description";
private static final Set HANDLED_FACET_TYPES = new HashSet<>();
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TauProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TauProcessor.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TauProcessor.java Wed Mar 07 17:36:04 2018 +0100
@@ -20,13 +20,12 @@
public final class TauProcessor extends AbstractSInfoLineProcessor {
- // FIXME: translate!
- private static final String I18N_AXIS_LABEL = "sinfo.chart.tau.section.yaxis.label";
+ // FIXME: check: filtered or not?
+ public static final String FACET_TKH_TAU_FILTERED = "sinfo_facet_tau.filtered";
- private static final String SINFO_CHART_TAU_YAXIS_LABEL = "sinfo.chart.tau.yaxis.label";
+ private static final String I18N_AXIS_LABEL = "sinfo.chart.tkh_tau.section.yaxis.label";
- // FIXME: check: filtered or not?
- private static final String FACET_TKH_TAU_FILTERED = "sinfo_tkh_tau.filtered";
+ private static final String SINFO_CHART_TAU_YAXIS_LABEL = "sinfo.chart.tkh_tau.yaxis.label";
private static final String I18N_FACET_TKH_TAU_FILTERED_DESCRIPTION = "sinfo.facet.tkh_tau.filtered.description";
@@ -50,7 +49,7 @@
throw new UnsupportedOperationException(error);
}
- public static Facet createD50Facet(final CallContext context, final String hash, final String id, final AbstractSInfoCalculationResult result,
+ public static Facet createTauFacet(final CallContext context, final String hash, final String id, final AbstractSInfoCalculationResult result,
final int index) {
final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), I18N_FACET_TKH_TAU_FILTERED_DESCRIPTION,
I18N_FACET_TKH_TAU_FILTERED_DESCRIPTION, result.getLabel());
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TkhProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TkhProcessor.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/TkhProcessor.java Wed Mar 07 17:36:04 2018 +0100
@@ -26,7 +26,7 @@
public final class TkhProcessor extends AbstractSInfoProcessor {
- private static String FACET_TKH = "sinfo_flow_depth.tkh";
+ private static String FACET_TKH = "sinfo_facet_tkh";
private static final String I18N_AXIS_LABEL = "sinfo.chart.tkh.section.yaxis.label";
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java Wed Mar 07 17:36:04 2018 +0100
@@ -20,13 +20,12 @@
public final class VelocityProcessor extends AbstractSInfoLineProcessor {
- // FIXME: translate!
- private static final String I18N_AXIS_LABEL = "sinfo.chart.velocity.section.yaxis.label";
+ // FIXME: check: filtered or not?
+ public static final String FACET_TKH_VELOCITY_FILTERED = "sinfo_facet_velocity.filtered";
- private static final String SINFO_CHART_VELOCITY_YAXIS_LABEL = "sinfo.chart.velocity.yaxis.label";
+ private static final String I18N_AXIS_LABEL = "sinfo.chart.tkh_velocity.section.yaxis.label";
- // FIXME: check: filtered or not?
- private static final String FACET_TKH_VELOCITY_FILTERED = "sinfo_tkh_velocity.filtered";
+ private static final String SINFO_CHART_VELOCITY_YAXIS_LABEL = "sinfo.chart.tkh_velocity.yaxis.label";
private static final String I18N_FACET_TKH_VELOCITY_FILTERED_DESCRIPTION = "sinfo.facet.tkh_velocity.filtered.description";
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhState.java Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhState.java Wed Mar 07 17:36:04 2018 +0100
@@ -23,8 +23,11 @@
import org.dive4elements.river.artifacts.model.FacetTypes;
import org.dive4elements.river.artifacts.model.ReportFacet;
import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
+import org.dive4elements.river.artifacts.sinfo.common.D50Processor;
import org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.TauProcessor;
import org.dive4elements.river.artifacts.sinfo.common.TkhProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.VelocityProcessor;
import org.dive4elements.river.artifacts.states.DefaultState;
/** State in which a waterlevel has been calculated. */
@@ -47,6 +50,12 @@
final String name = facet.getName();
if (FlowDepthProcessor.FACET_FLOW_DEPTH_FILTERED.equals(name))
return Boolean.FALSE;
+ if (VelocityProcessor.FACET_TKH_VELOCITY_FILTERED.equals(name))
+ return Boolean.FALSE;
+ if (TauProcessor.FACET_TKH_TAU_FILTERED.equals(name))
+ return Boolean.FALSE;
+ if (D50Processor.FACET_TKH_D50_FILTERED.equals(name))
+ return Boolean.FALSE;
}
return null;
@@ -105,8 +114,10 @@
facets.add(TkhProcessor.createTkhFacet(context, hash, this.id, result, index));
- // FIXME: should only be optionally visible
- facets.add(FlowDepthProcessor.createFlowDepthTkhFacet(context, hash, this.id, result, index));
+ facets.add(FlowDepthProcessor.createFlowDepthFacet(context, hash, this.id, result, index));
+ facets.add(VelocityProcessor.createVelocityFacet(context, hash, this.id, result, index));
+ facets.add(D50Processor.createD50Facet(context, hash, this.id, result, index));
+ facets.add(TauProcessor.createTauFacet(context, hash, this.id, result, index));
}
if (!resultList.isEmpty()) {
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/resources/messages.properties Wed Mar 07 17:36:04 2018 +0100
@@ -856,7 +856,7 @@
sinfo.chart.flow_depth.section.yaxis.label=Flie\u00dftiefe [m]
sinfo.facet.flow_depth.filtered.description = h ({0})
-sinfo.facet.flow_depth.tkh.filtered.description = h + \u0394d ({0})
+sinfo.facet.flow_depth_with_tkh.filtered.description = h + \u0394d ({0})
sinfo.chart.tkh.section.title=Transportk\u00f6rperh\u00f6hen
sinfo.chart.tkh.section.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm]
@@ -867,4 +867,16 @@
sinfo.export.tkh.csv.header.tkh = Transportk\u00f6rperh\u00f6he
sinfo.export.tkh.csv.header.tkhkind = Einteilung der Gew\u00e4ssersohle
sinfo.export.tkh.soilkind.mobil = Mobil
-sinfo.export.tkh.soilkind.starr = Starr
\ No newline at end of file
+sinfo.export.tkh.soilkind.starr = Starr
+
+sinfo.chart.tkh_velocity.section.yaxis.label = Flie\u00dfgeschwindigkeit [m/s]
+sinfo.chart.tkh_velocity.yaxis.label = Flie\u00dfgeschwindigkeit [m/s]
+sinfo.facet.tkh_velocity.filtered.description = Flie\u00dfgeschwindigkeit ({0})
+
+sinfo.chart.tkh_tau.section.yaxis.label = Sohlschubspannung [N/m\u00b2]
+sinfo.chart.tkh_tau.yaxis.label = Sohlschubspannung [N/m\u00b2]
+sinfo.facet.tkh_tau.filtered.description = Sohlschubspannung ({0})
+
+sinfo.chart.tkh_d50.section.yaxis.label = Sohlbeschaffenheit D50 [mm]
+sinfo.chart.tkh_d50.yaxis.label = Sohlbeschaffenheit D50 [mm]
+sinfo.facet.tkh_d50.filtered.description = Sohlbeschaffenheit D50 ({0})
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/resources/messages_de.properties Wed Mar 07 17:36:04 2018 +0100
@@ -856,7 +856,7 @@
sinfo.chart.flow_depth.section.yaxis.label=Flie\u00dftiefe [m]
sinfo.facet.flow_depth.filtered.description = h ({0})
-sinfo.facet.flow_depth.tkh.filtered.description = h + \u0394d ({0})
+sinfo.facet.flow_depth_with_tkh.filtered.description = h + \u0394d ({0})
sinfo.chart.tkh.section.title=Transportk\u00f6rperh\u00f6hen
sinfo.chart.tkh.section.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm]
@@ -867,4 +867,16 @@
sinfo.export.tkh.csv.header.tkh = Transportk\u00f6rperh\u00f6he
sinfo.export.tkh.csv.header.tkhkind = Einteilung der Gew\u00e4ssersohle
sinfo.export.tkh.soilkind.mobil = Mobil
-sinfo.export.tkh.soilkind.starr = Starr
\ No newline at end of file
+sinfo.export.tkh.soilkind.starr = Starr
+
+sinfo.chart.tkh_velocity.section.yaxis.label = Flie\u00dfgeschwindigkeit [m/s]
+sinfo.chart.tkh_velocity.yaxis.label = Flie\u00dfgeschwindigkeit [m/s]
+sinfo.facet.tkh_velocity.filtered.description = Flie\u00dfgeschwindigkeit ({0})
+
+sinfo.chart.tkh_tau.section.yaxis.label = Sohlschubspannung [N/m\u00b2]
+sinfo.chart.tkh_tau.yaxis.label = Sohlschubspannung [N/m\u00b2]
+sinfo.facet.tkh_tau.filtered.description = Sohlschubspannung ({0})
+
+sinfo.chart.tkh_d50.section.yaxis.label = Sohlbeschaffenheit D50 [mm]
+sinfo.chart.tkh_d50.yaxis.label = Sohlbeschaffenheit D50 [mm]
+sinfo.facet.tkh_d50.filtered.description = Sohlbeschaffenheit D50 ({0})
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Tue Mar 06 18:51:18 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Wed Mar 07 17:36:04 2018 +0100
@@ -1443,5 +1443,13 @@
String sinfo_tkhs();
String sinfo_tkk();
+
+ String sinfo_velocities();
+
+ String sinfo_taus();
+
+ String sinfo_bedqualities();
+
+ String sinfo_d50s();
}
// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Tue Mar 06 18:51:18 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Wed Mar 07 17:36:04 2018 +0100
@@ -766,4 +766,9 @@
sinfo_tkh_export = Transportk\u00f6rperh\u00f6hen Export
sinfo_tkh_report = Transportk\u00f6rperh\u00f6hen Bericht
sinfo_tkhs = Transportk\u00f6rperh\u00f6hen
-sinfo_tkk = Transportk\u00f6rperh\u00f6hen
\ No newline at end of file
+sinfo_tkk = Transportk\u00f6rperh\u00f6hen
+
+sinfo_velocities = Flie\u00dfgeschwindigkeiten
+sinfo_taus = Sohlschubspannung
+sinfo_bedqualities = Sohlbeschaffenheit
+sinfo_d50s = Korndurchmesser
\ No newline at end of file
diff -r 82998242ba84 -r a9950a3a71e5 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Tue Mar 06 18:51:18 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Wed Mar 07 17:36:04 2018 +0100
@@ -766,4 +766,9 @@
sinfo_tkh_export = Transportk\u00f6rperh\u00f6hen Export
sinfo_tkh_report = Transportk\u00f6rperh\u00f6hen Bericht
sinfo_tkhs = Transportk\u00f6rperh\u00f6hen
-sinfo_tkk = Transportk\u00f6rperh\u00f6hen
\ No newline at end of file
+sinfo_tkk = Transportk\u00f6rperh\u00f6hen
+
+sinfo_velocities = Flie\u00dfgeschwindigkeiten
+sinfo_taus = Sohlschubspannung
+sinfo_bedqualities = Sohlbeschaffenheit
+sinfo_d50s = Korndurchmesser
\ No newline at end of file