diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java @ 6412:c74261e05a62

issue1235: revert some changes, use correct Schwebstoff/Geschiebe-measurement-stations.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 25 Jun 2013 08:05:36 +0200
parents 43ef4943e0c2
children 0c593745bcd6
line wrap: on
line diff
--- 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());
             }

http://dive4elements.wald.intevation.org