Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java @ 7324:24023630f693
issue1345: Fix sediment load facet type, adjust theme name.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 14 Oct 2013 17:41:19 +0200 |
| parents | d7b2c14a9693 |
| children | 6bc884bab32e |
comparison
equal
deleted
inserted
replaced
| 7323:80c14a7e35f3 | 7324:24023630f693 |
|---|---|
| 149 String fraction = SedimentLoadFactory.getSedimentYieldFractionName(Integer.valueOf(code)); | 149 String fraction = SedimentLoadFactory.getSedimentYieldFractionName(Integer.valueOf(code)); |
| 150 String fractionName = Resources.getMsg(callMeta, fraction, "-"); | 150 String fractionName = Resources.getMsg(callMeta, fraction, "-"); |
| 151 Date[] dates = SedimentLoadFactory.getSedimentYieldTimes(Integer.valueOf(code)); | 151 Date[] dates = SedimentLoadFactory.getSedimentYieldTimes(Integer.valueOf(code)); |
| 152 Calendar date = Calendar.getInstance(); | 152 Calendar date = Calendar.getInstance(); |
| 153 date.setTime(dates[0]); | 153 date.setTime(dates[0]); |
| 154 String name = fractionName + " " + date.get(Calendar.YEAR); | 154 String name = fractionName + " - " + date.get(Calendar.YEAR); |
| 155 if (dates[1] != null) { | 155 if (dates[1] != null) { |
| 156 date.setTime(dates[1]); | 156 date.setTime(dates[1]); |
| 157 name += " - " + date.get(Calendar.YEAR); | 157 name += " - " + date.get(Calendar.YEAR); |
| 158 } | 158 } |
| 159 | 159 |
| 160 String facetType = ""; | |
| 161 if (fraction.equals("coarse")) { | |
| 162 facetType = SEDIMENT_LOAD_COARSE; | |
| 163 } | |
| 164 else if (fraction.equals("sand")) { | |
| 165 facetType = SEDIMENT_LOAD_SAND; | |
| 166 } | |
| 167 else if (fraction.equals("fine_middle")) { | |
| 168 facetType = SEDIMENT_LOAD_FINEMIDDLE; | |
| 169 } | |
| 170 else if (fraction.equals("susp_sand")) { | |
| 171 facetType = SEDIMENT_LOAD_SUSP_SAND; | |
| 172 } | |
| 173 else if (fraction.equals("susp_sand_bed")) { | |
| 174 facetType = SEDIMENT_LOAD_SUSP_SAND_BED; | |
| 175 } | |
| 176 else if (fraction.equals("suspended_sediment")) { | |
| 177 facetType = SEDIMENT_LOAD_SUSP_SEDIMENT; | |
| 178 } | |
| 179 else { | |
| 180 logger.error("Do not know fraction type " + fraction); | |
| 181 } | |
| 182 | |
| 160 Facet facet = new SedimentLoadFacet( | 183 Facet facet = new SedimentLoadFacet( |
| 161 0, | 184 0, |
| 162 SEDIMENT_LOAD_COARSE, | 185 facetType, |
| 163 name, | 186 name, |
| 164 //???? | 187 //???? |
| 165 ComputeType.ADVANCE, state.getID(), "hash" | 188 ComputeType.ADVANCE, state.getID(), "hash" |
| 166 ); | 189 ); |
| 167 fs.add(facet); | 190 fs.add(facet); |