Mercurial > dive4elements > river
changeset 8075:1cae4fc6bdd7
Merged
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 07 Aug 2014 17:26:18 +0200 |
| parents | bd0dfa57b1fe (current diff) dee3b3b0417e (diff) |
| children | e1b49fc9d2b5 |
| files | |
| diffstat | 9 files changed, 124 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/sqrelation.jrxml Thu Aug 07 17:24:33 2014 +0200 +++ b/artifacts/doc/conf/jasper/sqrelation.jrxml Thu Aug 07 17:26:18 2014 +0200 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.5"/> - <property name="ireport.x" value="54"/> - <property name="ireport.y" value="670"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="432"/> <subDataset name="dataset1"/> <field name="river" class="java.lang.String"/> <field name="periods" class="java.lang.String"/> @@ -224,45 +224,45 @@ <reportElement x="0" y="371" width="515" height="1"/> </line> <staticText> - <reportElement x="18" y="383" width="76" height="20"/> - <textElement markup="none"/> + <reportElement x="0" y="383" width="76" height="18"/> + <textElement verticalAlignment="Top" markup="none"/> <text><![CDATA[a]]></text> </staticText> <staticText> - <reportElement x="109" y="383" width="176" height="20"/> + <reportElement x="109" y="383" width="176" height="18"/> <textElement markup="none"/> <text><![CDATA[Transportkurvenkoeffizient]]></text> </staticText> <staticText> - <reportElement x="18" y="403" width="76" height="15"/> - <textElement markup="none"/> + <reportElement x="0" y="401" width="76" height="18"/> + <textElement verticalAlignment="Top" markup="none"/> <text><![CDATA[b]]></text> </staticText> <staticText> - <reportElement x="109" y="403" width="143" height="19"/> + <reportElement x="109" y="401" width="143" height="18"/> <textElement markup="none"/> <text><![CDATA[Transportkurvenexponent]]></text> </staticText> <staticText> - <reportElement x="18" y="417" width="76" height="24"/> - <textElement markup="none"/> + <reportElement x="0" y="419" width="76" height="18"/> + <textElement verticalAlignment="Top" markup="none"/> <text><![CDATA[Standardfehler]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="18" y="441" width="76" height="17" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled"> + <reportElement mode="Transparent" x="0" y="437" width="76" height="18" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="styled"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Q<sub>max</sub>]]></text> </staticText> <staticText> - <reportElement x="109" y="422" width="265" height="19"/> + <reportElement x="109" y="419" width="265" height="18"/> <textElement markup="none"/> <text><![CDATA[natürlicher Logarithmus der Standardabweichung]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="109" y="441" width="285" height="17" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="109" y="437" width="285" height="18" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -270,64 +270,64 @@ <text><![CDATA[maximal gemessener Abfluss [m³/s]]]></text> </staticText> <staticText> - <reportElement x="18" y="458" width="76" height="20"/> - <textElement markup="none"/> + <reportElement x="0" y="455" width="76" height="18"/> + <textElement verticalAlignment="Top" markup="none"/> <text><![CDATA[r²]]></text> </staticText> <staticText> - <reportElement x="109" y="458" width="100" height="20"/> + <reportElement x="109" y="455" width="100" height="18"/> <textElement markup="none"/> <text><![CDATA[Bestimmtheitsmaß]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="18" y="478" width="76" height="14" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled"> + <reportElement mode="Transparent" x="0" y="473" width="76" height="18" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="styled"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> - <text><![CDATA[n<sub>tot</sub>]]></text> + <text><![CDATA[n<sub>gesamt</sub>]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="18" y="492" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled"> + <reportElement mode="Transparent" x="0" y="491" width="76" height="18" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="styled"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[n<sub>Ausreißer</sub>]]></text> </staticText> <staticText> - <reportElement x="109" y="477" width="100" height="14"/> + <reportElement x="109" y="473" width="100" height="18"/> <textElement/> <text><![CDATA[Anzahl Messwerte]]></text> </staticText> <staticText> - <reportElement x="109" y="492" width="100" height="20"/> + <reportElement x="109" y="491" width="100" height="18"/> <textElement/> <text><![CDATA[Anzahl Ausreißer]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="18" y="512" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled"> + <reportElement mode="Transparent" x="0" y="509" width="76" height="18" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="styled"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[C<sub>Duan</sub>]]></text> </staticText> <staticText> - <reportElement x="109" y="512" width="181" height="20"/> + <reportElement x="109" y="509" width="181" height="18"/> <textElement/> <text><![CDATA[Bias Korrektur nach Duan 1983]]></text> </staticText> <staticText> - <reportElement mode="Transparent" x="18" y="532" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled"> + <reportElement mode="Transparent" x="0" y="527" width="76" height="18" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="styled"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[C <sub>Ferguson</sub>]]></text> </staticText> <staticText> - <reportElement x="109" y="532" width="181" height="20"/> + <reportElement x="109" y="527" width="181" height="18"/> <textElement/> <text><![CDATA[Bias Korrektur nach Ferguson 1986]]></text> </staticText>
--- a/artifacts/doc/conf/meta-data.xml Thu Aug 07 17:24:33 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Thu Aug 07 17:26:18 2014 +0200 @@ -1486,7 +1486,7 @@ <dc:macro name="yields"> <yields> - <dc:call-macro name="annotations_sediment_yield"/> + <dc:call-macro name="annotations_sediment_load_ls"/> <years> <dc:context> <dc:statement> @@ -1495,9 +1495,9 @@ sy.description AS description, ti.start_time AS year, gf.name AS fraction - FROM sediment_yield sy + FROM sediment_load_ls sy JOIN rivers r ON sy.river_id = r.id - JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id + JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id JOIN time_intervals ti ON sy.time_interval_id = ti.id JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id WHERE r.id = ${river_id} @@ -1519,9 +1519,9 @@ ti.start_time AS startyear, ti.stop_time AS endyear, gf.name AS fraction - FROM sediment_yield sy + FROM sediment_load_ls sy JOIN rivers r ON sy.river_id = r.id - JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id + JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id JOIN time_intervals ti ON sy.time_interval_id = ti.id JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id WHERE r.id = ${river_id} @@ -1575,7 +1575,7 @@ </annotations> </dc:macro> - <dc:macro name="annotations_sediment_yield"> + <dc:macro name="annotations_sediment_load_ls"> <sources_sinks> <dc:context> <dc:statement>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Thu Aug 07 17:24:33 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Thu Aug 07 17:26:18 2014 +0200 @@ -41,49 +41,49 @@ public static final String LOAD_DATA_CACHE_NAME = "sedimentload-data"; /** Query to get description and start year of single type - * sediment_yields. */ + * sediment_load_lss. */ public static final String SQL_SELECT_SINGLES = "SELECT DISTINCT " + " sy.description AS description, " + " ti.start_time AS year " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " WHERE r.name = :name " + " AND ti.stop_time IS NULL " + " AND syv.station BETWEEN :startKm AND :endKm"; - /** Query to get fraction name of single sediment_yield. */ + /** Query to get fraction name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_TIMES_BY_ID = "SELECT DISTINCT " + " ti.start_time AS starttime, " + " ti.stop_time AS stoptime " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN time_intervals ti ON ti.id = sy.time_interval_id " + " WHERE sy.id = :id "; - /** Query to get fraction name of single sediment_yield. */ + /** Query to get fraction name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_FRACTION_BY_ID = "SELECT DISTINCT " + " gf.name AS fraction " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN grain_fraction gf ON gf.id = grain_fraction_id " + " WHERE sy.id = :id "; - /** Query to get unit name of single sediment_yield. */ + /** Query to get unit name of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_UNIT_BY_ID = "SELECT DISTINCT " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN units u ON u.id = unit_id " + " WHERE sy.id = :id "; - /** Query to get description of single sediment_yield. */ + /** Query to get description of single sediment_load_ls. */ public static final String SQL_SELECT_SINGLE_BY_ID = "SELECT DISTINCT " + " sy.description AS description " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " WHERE sy.id = :id "; /** Query to get description, name and time range for official @@ -92,9 +92,9 @@ "SELECT DISTINCT " + " ti.start_time AS startYear, " + " ti.stop_time AS end " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " WHERE r.name = :name " + " AND ti.stop_time IS NOT NULL " + @@ -109,9 +109,9 @@ " ti.start_time AS startYear, " + " ti.stop_time AS end, " + " u.name AS unit" + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " JOIN units u ON u.id = sy.unit_id " + " WHERE r.name = :name " + @@ -126,8 +126,8 @@ " syv.station AS km, " + " u.name AS unit, " + " gf.name AS fraction " + - " FROM sediment_yield sy " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " FROM sediment_load_ls sy " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN units u ON u.id = sy.unit_id" + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " WHERE sy.id = :id" + @@ -140,10 +140,10 @@ " syv.value AS load, " + " syv.station AS km, " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id" + " WHERE r.name = :name " + @@ -161,10 +161,10 @@ " syv.value AS load, " + " syv.station AS km, " + " u.name AS unit " + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id" + " WHERE r.name = :name " + @@ -178,7 +178,7 @@ " sy.description AS description, " + " ti.start_time AS startYear, " + " ti.stop_time AS end " + - "FROM sediment_yield sy " + + "FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + @@ -196,10 +196,10 @@ " syv.station AS km," + " ti.stop_time AS endYear, " + " u.name AS unit" + - " FROM sediment_yield sy " + + " FROM sediment_load_ls sy " + " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + - " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN sediment_load_ls_values syv ON sy.id = syv.sediment_load_ls_id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + " JOIN units u ON u.id = sy.unit_id " + " WHERE r.name = :name " +
--- a/backend/doc/schema/oracle-drop-minfo.sql Thu Aug 07 17:24:33 2014 +0200 +++ b/backend/doc/schema/oracle-drop-minfo.sql Thu Aug 07 17:26:18 2014 +0200 @@ -22,11 +22,11 @@ ALTER TABLE discharge_zone DROP CONSTRAINT fk_dz_river_id; ALTER TABLE flow_velocity_measurements DROP CONSTRAINT fk_fvm_rivers_id; ALTER TABLE flow_velocity_measure_values DROP CONSTRAINT fk_fvmv_measurements_id; -ALTER TABLE sediment_yield DROP CONSTRAINT fk_sy_grain_fraction_id; -ALTER TABLE sediment_yield DROP CONSTRAINT fk_sy_unit_id; -ALTER TABLE sediment_yield DROP CONSTRAINT fk_sy_time_interval_id; -ALTER TABLE sediment_yield DROP CONSTRAINT fk_sy_river_id; -ALTER TABLE sediment_yield_values DROP CONSTRAINT fk_syv_sediment_yield_id; +ALTER TABLE sediment_load_ls DROP CONSTRAINT fk_slls_grain_fraction_id; +ALTER TABLE sediment_load_ls DROP CONSTRAINT fk_slls_unit_id; +ALTER TABLE sediment_load_ls DROP CONSTRAINT fk_slls_time_interval_id; +ALTER TABLE sediment_load_ls DROP CONSTRAINT fk_slls_river_id; +ALTER TABLE sediment_load_ls_values DROP CONSTRAINT fk_sllsv_sediment_load_ls_id; ALTER TABLE sediment_load DROP CONSTRAINT fk_sl_kind_id; ALTER TABLE sediment_load DROP CONSTRAINT fk_sl_grain_fraction_id; ALTER TABLE sediment_load DROP CONSTRAINT fk_sl_time_interval_id; @@ -60,8 +60,8 @@ DROP TABLE flow_velocity_measurements PURGE; DROP TABLE flow_velocity_measure_values PURGE; DROP TABLE grain_fraction PURGE; -DROP TABLE sediment_yield PURGE; -DROP TABLE sediment_yield_values PURGE; +DROP TABLE sediment_load_ls PURGE; +DROP TABLE sediment_load_ls_values PURGE; DROP TABLE sediment_load PURGE; DROP TABLE sediment_load_values PURGE; DROP TABLE measurement_station PURGE; @@ -85,8 +85,8 @@ DROP SEQUENCE FV_MEASURE_ID_SEQ; DROP SEQUENCE FV_MEASURE_VALUES_ID_SEQ; DROP SEQUENCE GRAIN_FRACTION_ID_SEQ; -DROP SEQUENCE SEDIMENT_YIELD_ID_SEQ; -DROP SEQUENCE SEDIMENT_YIELD_VALUES_ID_SEQ; +DROP SEQUENCE SEDIMENT_LOAD_LS_ID_SEQ; +DROP SEQUENCE SEDIMENT_LOAD_LS_VALUES_ID_SEQ; DROP SEQUENCE SEDIMENT_LOAD_ID_SEQ; DROP SEQUENCE SEDIMENT_LOAD_VALUES_ID_SEQ; DROP SEQUENCE MEASUREMENT_STATION_ID_SEQ;
--- a/backend/doc/schema/oracle-minfo.sql Thu Aug 07 17:24:33 2014 +0200 +++ b/backend/doc/schema/oracle-minfo.sql Thu Aug 07 17:26:18 2014 +0200 @@ -260,16 +260,16 @@ --lookup table for sediment yield kinds -CREATE TABLE sediment_yield_kinds ( +CREATE TABLE sediment_load_kinds ( id int PRIMARY KEY NOT NULL, kind VARCHAR(64) NOT NULL ); -INSERT INTO sediment_yield_kinds (id, kind) VALUES (0, 'non-official'); -INSERT INTO sediment_yield_kinds (id, kind) VALUES (1, 'official'); +INSERT INTO sediment_load_kinds (id, kind) VALUES (0, 'non-official'); +INSERT INTO sediment_load_kinds (id, kind) VALUES (1, 'official'); -CREATE SEQUENCE SEDIMENT_YIELD_ID_SEQ; +CREATE SEQUENCE SEDIMENT_LOAD_LS_ID_SEQ; -CREATE TABLE sediment_yield ( +CREATE TABLE sediment_load_ls ( id NUMBER(38,0) NOT NULL, river_id NUMBER(38,0) NOT NULL, grain_fraction_id NUMBER(38,0), @@ -279,25 +279,31 @@ description VARCHAR(256), kind NUMBER(38,0), PRIMARY KEY (id), - CONSTRAINT fk_sy_river_id FOREIGN KEY (river_id) REFERENCES rivers(id) ON DELETE CASCADE, - CONSTRAINT fk_sy_kind_id FOREIGN KEY (kind) REFERENCES sediment_yield_kinds(id), - CONSTRAINT fk_sy_grain_fraction_id FOREIGN KEY (grain_fraction_id) REFERENCES grain_fraction(id), - CONSTRAINT fk_sy_unit_id FOREIGN KEY (unit_id) REFERENCES units(id), - CONSTRAINT fk_sy_time_interval_id FOREIGN KEY (time_interval_id) REFERENCES time_intervals(id), - CONSTRAINT fk_sy_sq_time_interval_id FOREIGN KEY (sq_time_interval_id) + CONSTRAINT fk_slls_river_id FOREIGN KEY (river_id) + REFERENCES rivers(id) ON DELETE CASCADE, + CONSTRAINT fk_slls_kind_id FOREIGN KEY (kind) + REFERENCES sediment_load_kinds(id), + CONSTRAINT fk_slls_grain_fraction_id FOREIGN KEY (grain_fraction_id) + REFERENCES grain_fraction(id), + CONSTRAINT fk_slls_unit_id FOREIGN KEY (unit_id) + REFERENCES units(id), + CONSTRAINT fk_slls_time_interval_id FOREIGN KEY (time_interval_id) + REFERENCES time_intervals(id), + CONSTRAINT fk_slls_sq_time_interval_id FOREIGN KEY (sq_time_interval_id) REFERENCES time_intervals(id) ); -CREATE SEQUENCE SEDIMENT_YIELD_VALUES_ID_SEQ; +CREATE SEQUENCE SEDIMENT_LOAD_LS_VALUES_ID_SEQ; -CREATE TABLE sediment_yield_values ( +CREATE TABLE sediment_load_ls_values ( id NUMBER(38,0) NOT NULL, - sediment_yield_id NUMBER(38,0) NOT NULL, + sediment_load_ls_id NUMBER(38,0) NOT NULL, station NUMBER(38,3) NOT NULL, value NUMBER(38,3) NOT NULL, PRIMARY KEY (id), - CONSTRAINT fk_syv_sediment_yield_id FOREIGN KEY (sediment_yield_id) REFERENCES sediment_yield(id) ON DELETE CASCADE + CONSTRAINT fk_sllsv_sediment_load_ls_id FOREIGN KEY (sediment_load_ls_id) + REFERENCES sediment_load_ls(id) ON DELETE CASCADE ); @@ -335,7 +341,7 @@ kind int, PRIMARY KEY (id), CONSTRAINT fk_sl_kind_id FOREIGN KEY (kind) - REFERENCES sediment_yield_kinds(id), + REFERENCES sediment_load_kinds(id), CONSTRAINT fk_sl_grain_fraction_id FOREIGN KEY (grain_fraction_id) REFERENCES grain_fraction(id), CONSTRAINT fk_sl_time_interval_id FOREIGN KEY (time_interval_id)
--- a/backend/doc/schema/postgresql-minfo.sql Thu Aug 07 17:24:33 2014 +0200 +++ b/backend/doc/schema/postgresql-minfo.sql Thu Aug 07 17:26:18 2014 +0200 @@ -259,17 +259,17 @@ INSERT INTO grain_fraction VALUES (9, 'suspended_load', 0, 2); ---lookup table for sediment yield kinds -CREATE TABLE sediment_yield_kinds ( +--lookup table for sediment load kinds +CREATE TABLE sediment_load_kinds ( id int PRIMARY KEY NOT NULL, kind VARCHAR(64) NOT NULL ); -INSERT INTO sediment_yield_kinds (id, kind) VALUES (0, 'non-official'); -INSERT INTO sediment_yield_kinds (id, kind) VALUES (1, 'official'); +INSERT INTO sediment_load_kinds (id, kind) VALUES (0, 'non-official'); +INSERT INTO sediment_load_kinds (id, kind) VALUES (1, 'official'); -CREATE SEQUENCE SEDIMENT_YIELD_ID_SEQ; +CREATE SEQUENCE SEDIMENT_LOAD_LS_ID_SEQ; -CREATE TABLE sediment_yield ( +CREATE TABLE sediment_load_ls ( id int NOT NULL, river_id int NOT NULL, grain_fraction_id int, @@ -279,25 +279,31 @@ description VARCHAR(256), kind int, PRIMARY KEY (id), - CONSTRAINT fk_sy_river_id FOREIGN KEY (river_id) REFERENCES rivers(id) ON DELETE CASCADE, - CONSTRAINT fk_sy_kind_id FOREIGN KEY (kind) REFERENCES sediment_yield_kinds(id), - CONSTRAINT fk_sy_grain_fraction_id FOREIGN KEY (grain_fraction_id) REFERENCES grain_fraction(id), - CONSTRAINT fk_sy_unit_id FOREIGN KEY (unit_id) REFERENCES units(id), - CONSTRAINT fk_sy_time_interval_id FOREIGN KEY (time_interval_id) REFERENCES time_intervals(id), - CONSTRAINT fk_sy_sq_time_interval_id FOREIGN KEY (sq_time_interval_id) + CONSTRAINT fk_slls_river_id FOREIGN KEY (river_id) + REFERENCES rivers(id) ON DELETE CASCADE, + CONSTRAINT fk_slls_kind_id FOREIGN KEY (kind) + REFERENCES sediment_load_kinds(id), + CONSTRAINT fk_slls_grain_fraction_id FOREIGN KEY (grain_fraction_id) + REFERENCES grain_fraction(id), + CONSTRAINT fk_slls_unit_id FOREIGN KEY (unit_id) + REFERENCES units(id), + CONSTRAINT fk_slls_time_interval_id FOREIGN KEY (time_interval_id) + REFERENCES time_intervals(id), + CONSTRAINT fk_slls_sq_time_interval_id FOREIGN KEY (sq_time_interval_id) REFERENCES time_intervals(id) ); -CREATE SEQUENCE SEDIMENT_YIELD_VALUES_ID_SEQ; +CREATE SEQUENCE SEDIMENT_LOAD_LS_VALUES_ID_SEQ; -CREATE TABLE sediment_yield_values ( +CREATE TABLE sediment_load_ls_values ( id int NOT NULL, - sediment_yield_id int NOT NULL, + sediment_load_ls_id int NOT NULL, station NUMERIC NOT NULL, value NUMERIC NOT NULL, PRIMARY KEY (id), - CONSTRAINT fk_syv_sediment_yield_id FOREIGN KEY (sediment_yield_id) REFERENCES sediment_yield(id) ON DELETE CASCADE + CONSTRAINT fk_sllsv_sediment_load_ls_id FOREIGN KEY (sediment_load_ls_id) + REFERENCES sediment_load_ls(id) ON DELETE CASCADE ); @@ -335,7 +341,7 @@ kind int, PRIMARY KEY (id), CONSTRAINT fk_sl_kind_id FOREIGN KEY (kind) - REFERENCES sediment_yield_kinds(id), + REFERENCES sediment_load_kinds(id), CONSTRAINT fk_sl_grain_fraction_id FOREIGN KEY (grain_fraction_id) REFERENCES grain_fraction(id), CONSTRAINT fk_sl_time_interval_id FOREIGN KEY (time_interval_id)
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLS.java Thu Aug 07 17:24:33 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLS.java Thu Aug 07 17:26:18 2014 +0200 @@ -26,7 +26,7 @@ /** SedimentLoadLS of a certain Fraction with possibly many values. */ @Entity -@Table(name = "sediment_yield") +@Table(name = "sediment_load_ls") public class SedimentLoadLS implements Serializable { @@ -89,12 +89,12 @@ @Id @SequenceGenerator( - name = "SEQUENCE_SEDIMENT_YIELD_ID_SEQ", - sequenceName = "SEDIMENT_YIELD_ID_SEQ", + name = "SEQUENCE_SEDIMENT_LOAD_LS_ID_SEQ", + sequenceName = "SEDIMENT_LOAD_LS_ID_SEQ", allocationSize = 1) @GeneratedValue( strategy = GenerationType.SEQUENCE, - generator = "SEQUENCE_SEDIMENT_YIELD_ID_SEQ") + generator = "SEQUENCE_SEDIMENT_LOAD_LS_ID_SEQ") @Column(name = "id") public Integer getId() { return id; @@ -174,7 +174,7 @@ } @OneToMany - @JoinColumn(name="sediment_yield_id") + @JoinColumn(name="sediment_load_ls_id") public List<SedimentLoadLSValue> getSedimentLoadLSValues() { return values; }
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Thu Aug 07 17:24:33 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLSValue.java Thu Aug 07 17:26:18 2014 +0200 @@ -24,7 +24,7 @@ @Entity -@Table(name = "sediment_yield_values") +@Table(name = "sediment_load_ls_values") public class SedimentLoadLSValue implements Serializable { @@ -53,12 +53,12 @@ @Id @SequenceGenerator( - name = "SEQUENCE_SEDIMENT_YIELD_VALuES_ID_SEQ", - sequenceName = "SEDIMENT_YIELD_VALUES_ID_SEQ", + name = "SEQUENCE_SEDIMENT_LOAD_LS_VALUES_ID_SEQ", + sequenceName = "SEDIMENT_LOAD_LS_VALUES_ID_SEQ", allocationSize = 1) @GeneratedValue( strategy = GenerationType.SEQUENCE, - generator = "SEQUENCE_SEDIMENT_YIELD_VALuES_ID_SEQ") + generator = "SEQUENCE_SEDIMENT_LOAD_LS_VALUES_ID_SEQ") @Column(name = "id") public Integer getId() { return id; @@ -69,7 +69,7 @@ } @OneToOne - @JoinColumn(name = "sediment_yield_id" ) + @JoinColumn(name = "sediment_load_ls_id" ) public SedimentLoadLS getSedimentLoadLS() { return sedimentLoadLS; }