diff backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java @ 8560:6fcf4717605f

Meta-data on sounding width associated to bed heights is redundant to real data associated to values.
author "Tom Gottfried <tom@intevation.de>"
date Mon, 16 Feb 2015 11:48:05 +0100
parents 6d8d7425a6b5
children 5e38e2924c07
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java	Mon Feb 16 11:08:33 2015 +0100
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java	Mon Feb 16 11:48:05 2015 +0100
@@ -28,7 +28,6 @@
     private static Logger log = Logger.getLogger(ImportBedHeight.class);
 
     protected Integer year;
-    protected int soundingWidth;
 
     protected String evaluationBy;
     protected String description;
@@ -67,10 +66,6 @@
         // do nothing
     }
 
-    public void setSoundingWidth(int soundingWidth) {
-        this.soundingWidth = soundingWidth;
-    }
-
     public void setEvaluationBy(String evaluationBy) {
         this.evaluationBy = evaluationBy;
     }
@@ -161,13 +156,12 @@
 
             Query query = session.createQuery(
                 "from BedHeight where " +
-                "river=:river and year=:year and soundingWidth=:soundingWidth " +
+                "river=:river and year=:year " +
                 "and type=:type and locationSystem=:locationSystem and " +
                 "curElevationModel=:curElevationModel and range=:range");
 
             query.setParameter("river", river);
             query.setParameter("year", year);
-            query.setParameter("soundingWidth", soundingWidth);
             query.setParameter("type", theType);
             query.setParameter("locationSystem", locationSystem.getPeer());
             query.setParameter("curElevationModel", theCurModel);
@@ -180,7 +174,6 @@
                 peer = new BedHeight(
                     river,
                     year,
-                    soundingWidth,
                     theType,
                     locationSystem.getPeer(),
                     theCurModel,

http://dive4elements.wald.intevation.org