changeset 1236:324cb486db9f

Added relation and hibernate classes for DGMs. flys-backend/trunk@2613 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 31 Aug 2011 07:46:59 +0000 (2011-08-31)
parents 47ce1fab8464
children 774dff3ee546
files flys-backend/ChangeLog flys-backend/doc/schema/postgresql-spatial.sql flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java flys-backend/src/main/java/de/intevation/flys/model/DGM.java
diffstat 4 files changed, 127 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/ChangeLog	Tue Aug 30 15:14:59 2011 +0000
+++ b/flys-backend/ChangeLog	Wed Aug 31 07:46:59 2011 +0000
@@ -1,3 +1,15 @@
+2011-08-31  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that
+	  no data of the DGM is stored in this relation, but only the file path to
+	  the DGM file.
+
+	* src/main/java/de/intevation/flys/model/DGM.java: New. This class provides
+	  information for a DGM (km range and file path).
+
+	* src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
+	  Registered the DGM.
+
 2011-08-30  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New
--- a/flys-backend/doc/schema/postgresql-spatial.sql	Tue Aug 30 15:14:59 2011 +0000
+++ b/flys-backend/doc/schema/postgresql-spatial.sql	Wed Aug 31 07:46:59 2011 +0000
@@ -47,4 +47,15 @@
 );
 SELECT AddGeometryColumn('fixpoints', 'geom', 31466, 'POINT', 2);
 
+
+CREATE TABLE dgm (
+    id       SERIAL PRIMARY KEY NOT NULL,
+    river_id int REFERENCES rivers(id),
+    -- XXX Should we use the ranges table instead?
+    lower    NUMERIC,
+    upper    NUMERIC,
+    path     VARCHAR(256),
+    UNIQUE (river_id, lower, upper)
+);
+
 END;
--- a/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java	Tue Aug 30 15:14:59 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java	Wed Aug 31 07:46:59 2011 +0000
@@ -17,6 +17,7 @@
 import de.intevation.flys.model.CrossSectionLine;
 import de.intevation.flys.model.CrossSectionPoint;
 import de.intevation.flys.model.CrossSectionTrack;
+import de.intevation.flys.model.DGM;
 import de.intevation.flys.model.DischargeTable;
 import de.intevation.flys.model.DischargeTableValue;
 import de.intevation.flys.model.Edge;
@@ -157,6 +158,7 @@
         cfg.addAnnotatedClass(CrossSectionLine.class);
         cfg.addAnnotatedClass(CrossSectionPoint.class);
         cfg.addAnnotatedClass(CrossSectionTrack.class);
+        cfg.addAnnotatedClass(DGM.class);
         cfg.addAnnotatedClass(DischargeTable.class);
         cfg.addAnnotatedClass(DischargeTableValue.class);
         cfg.addAnnotatedClass(Edge.class);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/DGM.java	Wed Aug 31 07:46:59 2011 +0000
@@ -0,0 +1,102 @@
+package de.intevation.flys.model;
+
+import java.io.Serializable;
+import java.util.List;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.hibernate.Session;
+import org.hibernate.Query;
+
+import de.intevation.flys.backend.SessionHolder;
+
+
+@Entity
+@Table(name = "dgm")
+public class DGM implements Serializable {
+
+    private Integer    id;
+
+    private River      river;
+
+    private BigDecimal lower;
+    private BigDecimal upper;
+
+    private String     path;
+
+
+    public DGM() {
+    }
+
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    @Id
+    @Column(name = "id")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setRiver(River river) {
+        this.river = river;
+    }
+
+    @OneToOne
+    @JoinColumn(name = "river_id")
+    public River getRiver() {
+        return river;
+    }
+
+    public void setLower(BigDecimal lower) {
+        this.lower = lower;
+    }
+
+    @Column(name = "lower")
+    public BigDecimal getLower() {
+        return lower;
+    }
+
+    public void setUpper(BigDecimal upper) {
+        this.upper = upper;
+    }
+
+    @Column(name = "upper")
+    public BigDecimal getUpper() {
+        return upper;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    @Column(name = "path")
+    public String getPath() {
+        return path;
+    }
+
+
+    public static DGM getDGM(String river, double lower, double upper) {
+        Session session = SessionHolder.HOLDER.get();
+
+        Query query = session.createQuery(
+            "from DGM where river.name =:river and " +
+            "lower <=:lower and upper >=:lower and " +
+            "lower <=:upper and upper >=:upper");
+        query.setParameter("river", river);
+        query.setParameter("lower", new BigDecimal(lower));
+        query.setParameter("upper", new BigDecimal(upper));
+
+        List<DGM> result = query.list();
+
+        return result.isEmpty() ? null : result.get(0);
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org