[Dive4elements-commits] [PATCH 2 of 2] issue1235: revert some changes, use correct Schwebstoff/Geschiebe-measurement-stations

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1372140336 -7200
# Node ID c74261e05a62388b818f642aad052a77ef99a077
# Parent  a21f7a3e4be567ba8201d8979189d376abd86445
issue1235: revert some changes, use correct Schwebstoff/Geschiebe-measurement-stations.

diff -r a21f7a3e4be5 -r c74261e05a62 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java	Tue Jun 25 07:59:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java	Tue Jun 25 08:05:36 2013 +0200
@@ -84,13 +84,13 @@
             if (station.getRange() == null || station.getMeasurementType() == null) {
                 continue;
             }
-            if (FacetTypes.IS.SEDIMENT_LOAD_NO_FLOAT(this.getName())
-                && station.getMeasurementType().equals("Geschiebe")) {
+            if (this.getName().contains("susp_sediment")
+                && station.getMeasurementType().equals("Schwebstoff")) {
                 stations.add(station);
                 sortedStarts.add(station.getStation());
             }
-            else if (!FacetTypes.IS.SEDIMENT_LOAD_NO_FLOAT(this.getName())
-                && station.getMeasurementType().equals("Schwebstoff")) {
+            else if (!this.getName().contains("susp_sediment")
+                && station.getMeasurementType().equals("Geschiebe")) {
                 stations.add(station);
                 sortedStarts.add(station.getStation());
             }
diff -r a21f7a3e4be5 -r c74261e05a62 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Tue Jun 25 07:59:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Tue Jun 25 08:05:36 2013 +0200
@@ -355,8 +355,8 @@
             getValues("fine_middle", sqlQuery, load, floatStations);
             getValues("sand", sqlQuery, load, floatStations);
             getValues("suspended_sediment", sqlQuery, load, suspStations);
-            getValues("susp_sand_bed", sqlQuery, load, suspStations);
-            getValues("susp_sand", sqlQuery, load, suspStations);
+            getValues("susp_sand_bed", sqlQuery, load, floatStations);
+            getValues("susp_sand", sqlQuery, load, floatStations);
 
             return load;
         }
@@ -402,8 +402,8 @@
             getValues("fine_middle", sqlQuery, load, floatStations);
             getValues("sand", sqlQuery, load, floatStations);
             getValues("suspended_sediment", sqlQuery, load, suspStations);
-            getValues("susp_sand_bed", sqlQuery, load, suspStations);
-            getValues("susp_sand", sqlQuery, load, suspStations);
+            getValues("susp_sand_bed", sqlQuery, load, floatStations);
+            getValues("susp_sand", sqlQuery, load, floatStations);
             return load;
         }
         return new SedimentLoad();