[Lada-commits] [PATCH 4 of 4] merged
Wald Commits
scm-commit at wald.intevation.org
Fri Apr 8 19:36:33 CEST 2016
# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1460136985 -7200
# Node ID 9f6b1df4b1e6e5494b61c652952d6e821badb68e
# Parent d53261aa38eb6449b2988c16df33dc158d5a8e3a
# Parent 54e83373bfaef7242cf66fa63f5ab54692388e4d
merged.
diff -r d53261aa38eb -r 9f6b1df4b1e6 db_schema/lada_data.sql
--- a/db_schema/lada_data.sql Fri Apr 08 19:36:06 2016 +0200
+++ b/db_schema/lada_data.sql Fri Apr 08 19:36:25 2016 +0200
@@ -2,18 +2,13 @@
-- PostgreSQL database dump
--
--- Dumped from database version 9.5.1
--- Dumped by pg_dump version 9.5.0
-
--- Started on 2016-03-31 11:55:47
-
SET statement_timeout = 0;
SET lock_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SET check_function_bodies = false;
SET client_min_messages = warning;
-SET row_security = off;
+
SET search_path = land, pg_catalog;
@@ -1236,7 +1231,22 @@
ALTER TABLE zusatz_wert ENABLE TRIGGER ALL;
--- Completed on 2016-03-31 11:55:55
+
+
+SET search_path = bund, pg_catalog;
+
+SELECT pg_catalog.setval('kommentar_id_seq', 661, true);
+
+SELECT pg_catalog.setval('messung_id_seq', 1009, true);
+
+SELECT pg_catalog.setval('messwert_id_seq', 6471, true);
+
+SELECT pg_catalog.setval('ort_id_seq', 921, true);
+
+SELECT pg_catalog.setval('probe_id_seq', 733, true);
+
+SELECT pg_catalog.setval('zusatz_wert_id_seq', 30, true);
+
--
-- PostgreSQL database dump complete
diff -r d53261aa38eb -r 9f6b1df4b1e6 db_schema/lada_schema.sql
--- a/db_schema/lada_schema.sql Fri Apr 08 19:36:06 2016 +0200
+++ b/db_schema/lada_schema.sql Fri Apr 08 19:36:25 2016 +0200
@@ -302,9 +302,9 @@
messungs_id integer NOT NULL,
messgroesse_id integer NOT NULL,
messwert_nwg character varying(1),
- messwert real NOT NULL,
+ messwert double precision NOT NULL,
messfehler real,
- nwg_zu_messwert real,
+ nwg_zu_messwert double precision,
meh_id smallint NOT NULL,
grenzwertueberschreitung boolean DEFAULT false,
letzte_aenderung timestamp without time zone DEFAULT now()
@@ -495,10 +495,10 @@
id integer DEFAULT nextval('zusatz_wert_id_seq'::regclass) NOT NULL,
probe_id integer NOT NULL,
pzs_id character varying(3) NOT NULL,
- messwert_pzs real,
+ messwert_pzs double precision,
messfehler real,
letzte_aenderung timestamp without time zone DEFAULT now(),
- nwg_zu_messwert real
+ nwg_zu_messwert double precision
);
diff -r d53261aa38eb -r 9f6b1df4b1e6 db_schema/stammdaten_data.sql
--- a/db_schema/stammdaten_data.sql Fri Apr 08 19:36:06 2016 +0200
+++ b/db_schema/stammdaten_data.sql Fri Apr 08 19:36:25 2016 +0200
@@ -13,7 +13,6 @@
SET standard_conforming_strings = on;
SET check_function_bodies = false;
SET client_min_messages = warning;
-SET row_security = off;
SET search_path = stammdaten, pg_catalog;
@@ -22008,7 +22007,7 @@
--
COPY favorite (id, user_id, query_id) FROM stdin;
-11 1 6
+11 1 2
\.
@@ -36478,21 +36477,21 @@
--
COPY ort (id, netzbetreiber_id, ort_id, langtext, staat_id, gem_id, unscharf, nuts_code, kda_id, koord_x_extern, koord_y_extern, hoehe_land, letzte_aenderung, latitude, longitude, geom, shape, ort_typ, kurztext, berichtstext, zone, sektor, zustaendigkeit, mp_art, aktiv, anlage_id, oz_id) FROM stdin;
-19 \N T060014 WW Kassel 0 06611000 0 DE731 5 32531152 5684269 \N 2013-08-12 07:57:26.332873 51.308880000000002 9.44693000000000005 0101000020E6100000DB334B02D4E42240BA313D6189A74940 \N 1 T060014 \N \N \N \N \N \N \N \N
-33 \N T110001 WW Beelitzhof, Berlin 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 T110001 \N \N \N \N \N \N \N \N
-51 \N T060005 WW Eschollbruecken 0 06432018 0 DE716 5 32470178 5516260 \N 2013-08-12 07:57:26.332873 49.7980500000000035 8.58561000000000085 0101000020E6100000CF6BEC12D52B214052499D8026E64840 \N 1 T060005 \N \N \N \N \N \N \N \N
-61 \N M060003 (MVA) Kassel 0 06611000 0 DE731 5 32531152 5684269 \N 2013-08-12 07:57:26.332873 51.308880000000002 9.44693000000000005 0101000020E6100000DB334B02D4E42240BA313D6189A74940 \N 1 M060003 \N \N \N \N \N \N \N \N
-64 \N FKI0005 Kinzig; Hanau; PE-Stelle kurz vor Mündung in Main 0 06435014 0 DE719 5 32493851 5551177 \N 2013-08-12 07:57:26.332873 50.1128100000000032 8.9139999999999997 0101000020E61000008716D9CEF7D32140B554DE8E700E4940 \N 1 FKI0005 \N \N \N \N \N \N \N \N
-85 \N FSD0005 Schwarzbach/Hessen; Trebur; PE-Ort Trebur-Astheim 0 06433014 0 DE717 5 32456065 5529415 \N 2013-08-12 07:57:26.332873 49.9155000000000015 8.38803000000000054 0101000020E6100000D8BB3FDEABC6204077BE9F1A2FF54840 \N 1 FSD0005 \N \N \N \N \N \N \N \N
-140 \N FSP0092 Spree km 9.20; PE-Stelle Nr. 11002, Einmündung Landwehrkanal 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 FSP0092 \N \N \N \N \N \N \N \N
+19 D T060014 WW Kassel 0 06611000 0 DE731 5 32531152 5684269 \N 2013-08-12 07:57:26.332873 51.308880000000002 9.44693000000000005 0101000020E6100000DB334B02D4E42240BA313D6189A74940 \N 1 T060014 \N \N \N \N \N \N \N \N
+33 D T110001 WW Beelitzhof, Berlin 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 T110001 \N \N \N \N \N \N \N \N
+51 D T060005 WW Eschollbruecken 0 06432018 0 DE716 5 32470178 5516260 \N 2013-08-12 07:57:26.332873 49.7980500000000035 8.58561000000000085 0101000020E6100000CF6BEC12D52B214052499D8026E64840 \N 1 T060005 \N \N \N \N \N \N \N \N
+61 D M060003 (MVA) Kassel 0 06611000 0 DE731 5 32531152 5684269 \N 2013-08-12 07:57:26.332873 51.308880000000002 9.44693000000000005 0101000020E6100000DB334B02D4E42240BA313D6189A74940 \N 1 M060003 \N \N \N \N \N \N \N \N
+64 D FKI0005 Kinzig; Hanau; PE-Stelle kurz vor Mündung in Main 0 06435014 0 DE719 5 32493851 5551177 \N 2013-08-12 07:57:26.332873 50.1128100000000032 8.9139999999999997 0101000020E61000008716D9CEF7D32140B554DE8E700E4940 \N 1 FKI0005 \N \N \N \N \N \N \N \N
+85 D FSD0005 Schwarzbach/Hessen; Trebur; PE-Ort Trebur-Astheim 0 06433014 0 DE717 5 32456065 5529415 \N 2013-08-12 07:57:26.332873 49.9155000000000015 8.38803000000000054 0101000020E6100000D8BB3FDEABC6204077BE9F1A2FF54840 \N 1 FSD0005 \N \N \N \N \N \N \N \N
+140 D FSP0092 Spree km 9.20; PE-Stelle Nr. 11002, Einmündung Landwehrkanal 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 FSP0092 \N \N \N \N \N \N \N \N
190 06 D_ 00190 Reinheim 0 06432019 0 DE716 5 32487017 5519769 \N 2013-08-12 07:57:26.332873 49.830210000000001 8.81948000000000043 0101000020E6100000C173EFE192A32140F5673F5244EA4840 \N 1 D_ 00190 \N \N \N \N \N \N \N \N
-156 \N T060020 WW Wiesbaden-Schierstein 0 06414000 0 DE714 5 32447434 5548087 \N 2013-08-12 07:57:26.332873 50.0827200000000019 8.26525999999999961 0101000020E6100000B9DFA128D0872040D15CA791960A4940 \N 1 T060020 \N \N \N \N \N \N \N \N
-165 \N SMG1101 Müggelsee; Berlin; PE-Stelle Nr. 41035 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 SMG1101 \N \N \N \N \N \N \N \N
-168 \N D060003 Uttershausen 0 06634025 0 DE735 5 32526698 5659112 \N 2013-08-12 07:57:26.332873 51.082889999999999 9.3811599999999995 0101000020E610000033164D6727C322402D95B7239C8A4940 \N 1 D060003 \N \N \N \N \N \N \N \N
-173 \N K060022 KLA Wiesbaden 0 06414000 0 DE714 5 32447434 5548087 \N 2013-08-12 07:57:26.332873 50.0827200000000019 8.26525999999999961 0101000020E6100000B9DFA128D0872040D15CA791960A4940 \N 1 K060022 \N \N \N \N \N \N \N \N
-198 \N M060001 (SEVA) Frankfurt/M. Sindlingen 0 06412000 0 DE712 5 32475476 5550676 \N 2013-08-12 07:57:26.332873 50.1078299999999999 8.65704000000000029 0101000020E6100000E353008C675021408BC3995FCD0D4940 \N 1 M060001 \N \N \N \N \N \N \N \N
-218 \N SMG1100 Müggelsee 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 SMG1100 \N \N \N \N \N \N \N \N
-223 \N T110015 Grundwasser Tempelhof ( Ringbahnstraße ) 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 T110015 \N \N \N \N \N \N \N \N
+156 D T060020 WW Wiesbaden-Schierstein 0 06414000 0 DE714 5 32447434 5548087 \N 2013-08-12 07:57:26.332873 50.0827200000000019 8.26525999999999961 0101000020E6100000B9DFA128D0872040D15CA791960A4940 \N 1 T060020 \N \N \N \N \N \N \N \N
+165 D SMG1101 Müggelsee; Berlin; PE-Stelle Nr. 41035 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 SMG1101 \N \N \N \N \N \N \N \N
+168 D D060003 Uttershausen 0 06634025 0 DE735 5 32526698 5659112 \N 2013-08-12 07:57:26.332873 51.082889999999999 9.3811599999999995 0101000020E610000033164D6727C322402D95B7239C8A4940 \N 1 D060003 \N \N \N \N \N \N \N \N
+173 D K060022 KLA Wiesbaden 0 06414000 0 DE714 5 32447434 5548087 \N 2013-08-12 07:57:26.332873 50.0827200000000019 8.26525999999999961 0101000020E6100000B9DFA128D0872040D15CA791960A4940 \N 1 K060022 \N \N \N \N \N \N \N \N
+198 D M060001 (SEVA) Frankfurt/M. Sindlingen 0 06412000 0 DE712 5 32475476 5550676 \N 2013-08-12 07:57:26.332873 50.1078299999999999 8.65704000000000029 0101000020E6100000E353008C675021408BC3995FCD0D4940 \N 1 M060001 \N \N \N \N \N \N \N \N
+218 D SMG1100 Müggelsee 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 SMG1100 \N \N \N \N \N \N \N \N
+223 D T110015 Grundwasser Tempelhof ( Ringbahnstraße ) 0 11000000 0 DE300 5 33390988 5821608 \N 2013-08-12 07:57:26.332873 52.5336399999999983 13.3928399999999996 0101000020E61000000C1F115322C92A4031EBC5504E444A40 \N 1 T110015 \N \N \N \N \N \N \N \N
4 06 D_ 00004 Wabern 0 06634025 0 DE735 5 32526698 5659112 \N 2013-08-12 07:57:26.332873 51.082889999999999 9.3811599999999995 0101000020E610000033164D6727C322402D95B7239C8A4940 \N 1 D_ 00004 \N \N \N \N \N \N \N \N
5 06 D_ 00005 Hanau 0 06435014 0 DE719 5 32493851 5551177 \N 2013-08-12 07:57:26.332873 50.1128100000000032 8.9139999999999997 0101000020E61000008716D9CEF7D32140B554DE8E700E4940 \N 1 D_ 00005 \N \N \N \N \N \N \N \N
12 06 D_ 00012 Wiesbaden 0 06414000 0 DE714 5 32447434 5548087 \N 2013-08-12 07:57:26.332873 50.0827200000000019 8.26525999999999961 0101000020E6100000B9DFA128D0872040D15CA791960A4940 \N 1 D_ 00012 \N \N \N \N \N \N \N \N
diff -r d53261aa38eb -r 9f6b1df4b1e6 db_schema/stammdaten_schema.sql
--- a/db_schema/stammdaten_schema.sql Fri Apr 08 19:36:06 2016 +0200
+++ b/db_schema/stammdaten_schema.sql Fri Apr 08 19:36:25 2016 +0200
@@ -494,7 +494,7 @@
CREATE TABLE ort (
id integer PRIMARY KEY DEFAULT nextval('ort_id_seq'::regclass),
- netzbetreiber_id character varying(2) REFERENCES netz_betreiber,
+ netzbetreiber_id character varying(2) NOT NULL REFERENCES netz_betreiber,
ort_id character varying(10) NOT NULL,
langtext character varying(100) NOT NULL,
staat_id smallint NOT NULL REFERENCES staat,
diff -r d53261aa38eb -r 9f6b1df4b1e6 src/main/java/de/intevation/lada/factory/ProbeFactory.java
--- a/src/main/java/de/intevation/lada/factory/ProbeFactory.java Fri Apr 08 19:36:06 2016 +0200
+++ b/src/main/java/de/intevation/lada/factory/ProbeFactory.java Fri Apr 08 19:36:25 2016 +0200
@@ -213,7 +213,7 @@
LMesswert wert = new LMesswert();
wert.setMessgroesseId(mw);
wert.setMessungsId(messung.getId());
- wert.setMesswert(0f);
+ wert.setMesswert(0d);
wert.setMehId(1);
repository.create(wert, "land");
}
diff -r d53261aa38eb -r 9f6b1df4b1e6 src/main/java/de/intevation/lada/importer/laf/AttributeMapper.java
--- a/src/main/java/de/intevation/lada/importer/laf/AttributeMapper.java Fri Apr 08 19:36:06 2016 +0200
+++ b/src/main/java/de/intevation/lada/importer/laf/AttributeMapper.java Fri Apr 08 19:36:25 2016 +0200
@@ -416,8 +416,7 @@
wert = wert.substring(2);
messwert.setGrenzwertueberschreitung(true);
}
- float fWert = Float.valueOf(wert);
- messwert.setMesswert(fWert);
+ messwert.setMesswert(Double.valueOf(wert));
QueryBuilder<MessEinheit> builder =
new QueryBuilder<MessEinheit>(
@@ -552,7 +551,7 @@
return null;
}
wert.setPzsId(zusatz.get(0).getId());
- wert.setMesswertPzs(Float.valueOf(w));
+ wert.setMesswertPzs(Double.valueOf(w));
wert.setMessfehler(Float.valueOf(fehler));
return wert;
}
@@ -580,7 +579,7 @@
ndx = v.indexOf(" ");
String fehler = v.substring(ndx + 2);
wert.setPzsId(groesse);
- wert.setMesswertPzs(Float.valueOf(w));
+ wert.setMesswertPzs(Double.valueOf(w));
wert.setMessfehler(Float.valueOf(fehler));
return wert;
}
diff -r d53261aa38eb -r 9f6b1df4b1e6 src/main/java/de/intevation/lada/model/Messwert.java
--- a/src/main/java/de/intevation/lada/model/Messwert.java Fri Apr 08 19:36:06 2016 +0200
+++ b/src/main/java/de/intevation/lada/model/Messwert.java Fri Apr 08 19:36:25 2016 +0200
@@ -48,13 +48,13 @@
@Column(name="messungs_id")
private Integer messungsId;
- private Float messwert;
+ private Double messwert;
@Column(name="messwert_nwg")
private String messwertNwg;
@Column(name="nwg_zu_messwert")
- private Float nwgZuMesswert;
+ private Double nwgZuMesswert;
@Transient
private boolean owner;
@@ -121,11 +121,11 @@
this.messungsId = messungsId;
}
- public Float getMesswert() {
+ public Double getMesswert() {
return this.messwert;
}
- public void setMesswert(Float messwert) {
+ public void setMesswert(Double messwert) {
this.messwert = messwert;
}
@@ -137,11 +137,11 @@
this.messwertNwg = messwertNwg;
}
- public Float getNwgZuMesswert() {
+ public Double getNwgZuMesswert() {
return this.nwgZuMesswert;
}
- public void setNwgZuMesswert(Float nwgZuMesswert) {
+ public void setNwgZuMesswert(Double nwgZuMesswert) {
this.nwgZuMesswert = nwgZuMesswert;
}
diff -r d53261aa38eb -r 9f6b1df4b1e6 src/main/java/de/intevation/lada/model/ZusatzWert.java
--- a/src/main/java/de/intevation/lada/model/ZusatzWert.java Fri Apr 08 19:36:06 2016 +0200
+++ b/src/main/java/de/intevation/lada/model/ZusatzWert.java Fri Apr 08 19:36:25 2016 +0200
@@ -38,10 +38,10 @@
private Float messfehler;
@Column(name="messwert_pzs")
- private Float messwertPzs;
+ private Double messwertPzs;
@Column(name="nwg_zu_messwert")
- private Float nwgZuMesswert;
+ private Double nwgZuMesswert;
@Column(name="probe_id")
private Integer probeId;
@@ -82,19 +82,19 @@
this.messfehler = messfehler;
}
- public Float getMesswertPzs() {
+ public Double getMesswertPzs() {
return this.messwertPzs;
}
- public void setMesswertPzs(Float messwertPzs) {
+ public void setMesswertPzs(Double messwertPzs) {
this.messwertPzs = messwertPzs;
}
- public Float getNwgZuMesswert() {
+ public Double getNwgZuMesswert() {
return this.nwgZuMesswert;
}
- public void setNwgZuMesswert(Float nwgZuMesswert) {
+ public void setNwgZuMesswert(Double nwgZuMesswert) {
this.nwgZuMesswert = nwgZuMesswert;
}
diff -r d53261aa38eb -r 9f6b1df4b1e6 src/main/java/de/intevation/lada/validation/rules/messwert/HasMessunsicherheit.java
--- a/src/main/java/de/intevation/lada/validation/rules/messwert/HasMessunsicherheit.java Fri Apr 08 19:36:06 2016 +0200
+++ b/src/main/java/de/intevation/lada/validation/rules/messwert/HasMessunsicherheit.java Fri Apr 08 19:36:25 2016 +0200
@@ -25,8 +25,8 @@
public Violation execute(Object object) {
LMesswert messwert = (LMesswert)object;
Float unsicherheit = messwert.getMessfehler();
- Float nachweisgrenze = messwert.getNwgZuMesswert();
- Float wert = messwert.getMesswert();
+ Double nachweisgrenze = messwert.getNwgZuMesswert();
+ Double wert = messwert.getMesswert();
if (unsicherheit != null && unsicherheit > 0f) {
return null;
}
More information about the Lada-commits
mailing list