Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java @ 6519:862c7f511c35
Artifacts: Another fix for the 'Amtlichen Linien'. Stupid copy/paste error while taking the range of a gauge.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Sat, 29 Jun 2013 09:27:19 +0200 |
| parents | 1e6bd2831280 |
| children | b78d110135ec |
comparison
equal
deleted
inserted
replaced
| 6513:4447045ebcc6 | 6519:862c7f511c35 |
|---|---|
| 112 return "[" + name + | 112 return "[" + name + |
| 113 " value: " + value + | 113 " value: " + value + |
| 114 " wstId: " + wstId + | 114 " wstId: " + wstId + |
| 115 " pos: " + columnPos + | 115 " pos: " + columnPos + |
| 116 " source: " + source + | 116 " source: " + source + |
| 117 " date: " + date +"]"; | 117 " date: " + date + |
| 118 " from: " + start + | |
| 119 " to: " + end + "]"; | |
| 118 } | 120 } |
| 119 } | 121 } |
| 120 | 122 |
| 121 public OfficialLineFinder() { | 123 public OfficialLineFinder() { |
| 122 } | 124 } |
| 166 List<MainValue> mainValues = gauge.getMainValues(); | 168 List<MainValue> mainValues = gauge.getMainValues(); |
| 167 for (MainValue mainValue: mainValues) { | 169 for (MainValue mainValue: mainValues) { |
| 168 NamedMainValue tnmv = mainValue.getMainValue(); | 170 NamedMainValue tnmv = mainValue.getMainValue(); |
| 169 if (tnmv.getId().equals(mnvId)) { | 171 if (tnmv.getId().equals(mnvId)) { |
| 170 // found gauge with this main value | 172 // found gauge with this main value |
| 171 | |
| 172 double from = gauge.getRange().getA().doubleValue(); | 173 double from = gauge.getRange().getA().doubleValue(); |
| 173 double to = gauge.getRange().getA().doubleValue(); | 174 double to = gauge.getRange().getB().doubleValue(); |
| 174 double value = mainValue.getValue().doubleValue(); | 175 double value = mainValue.getValue().doubleValue(); |
| 175 int wstId = wst.getId(); | 176 int wstId = wst.getId(); |
| 176 int pos = wc.getPosition(); | 177 int pos = wc.getPosition(); |
| 177 ValueRange range = new ValueRange( | 178 ValueRange range = new ValueRange( |
| 178 from, to, value, wstId, pos, | 179 from, to, value, wstId, pos, |