Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6411:a21f7a3e4be5 | 6412:c74261e05a62 |
|---|---|
| 82 List<MeasurementStation> stations = new ArrayList<MeasurementStation>(); | 82 List<MeasurementStation> stations = new ArrayList<MeasurementStation>(); |
| 83 for (MeasurementStation station: allStations) { | 83 for (MeasurementStation station: allStations) { |
| 84 if (station.getRange() == null || station.getMeasurementType() == null) { | 84 if (station.getRange() == null || station.getMeasurementType() == null) { |
| 85 continue; | 85 continue; |
| 86 } | 86 } |
| 87 if (FacetTypes.IS.SEDIMENT_LOAD_NO_FLOAT(this.getName()) | 87 if (this.getName().contains("susp_sediment") |
| 88 && station.getMeasurementType().equals("Geschiebe")) { | 88 && station.getMeasurementType().equals("Schwebstoff")) { |
| 89 stations.add(station); | 89 stations.add(station); |
| 90 sortedStarts.add(station.getStation()); | 90 sortedStarts.add(station.getStation()); |
| 91 } | 91 } |
| 92 else if (!FacetTypes.IS.SEDIMENT_LOAD_NO_FLOAT(this.getName()) | 92 else if (!this.getName().contains("susp_sediment") |
| 93 && station.getMeasurementType().equals("Schwebstoff")) { | 93 && station.getMeasurementType().equals("Geschiebe")) { |
| 94 stations.add(station); | 94 stations.add(station); |
| 95 sortedStarts.add(station.getStation()); | 95 sortedStarts.add(station.getStation()); |
| 96 } | 96 } |
| 97 } | 97 } |
| 98 Collections.sort(sortedStarts); | 98 Collections.sort(sortedStarts); |