Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java @ 739:08a3c3651e36
Fix for flys/issue173
flys-artifacts/trunk@2236 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 26 Jun 2011 16:19:02 +0000 |
| parents | 3b7e9ddf6bb1 |
| children | c09c9e05ecfa |
comparison
equal
deleted
inserted
replaced
| 738:5abdb2fa8eb1 | 739:08a3c3651e36 |
|---|---|
| 49 | 49 |
| 50 int numResults = -1; | 50 int numResults = -1; |
| 51 | 51 |
| 52 // assign reference points | 52 // assign reference points |
| 53 for (Segment segment: segments) { | 53 for (Segment segment: segments) { |
| 54 Gauge gauge = river.determineGaugeByStation( | 54 Gauge gauge = river.maxOverlap(segment.getFrom(), segment.getTo()); |
| 55 segment.getFrom(), segment.getTo()); | 55 |
| 56 | 56 if (gauge == null) { |
| 57 segment.setReferencePoint(gauge != null | 57 logger.warn("no gauge found. Defaults to mid point."); |
| 58 ? gauge.getStation().doubleValue() | 58 segment.setReferencePoint( |
| 59 : 0.5*(segment.getFrom() + segment.getTo())); | 59 0.5*(segment.getFrom()+segment.getTo())); |
| 60 } | |
| 61 else { | |
| 62 double ref = gauge.getStation().doubleValue(); | |
| 63 logger.debug( | |
| 64 "reference gauge: " + gauge.getName() + | |
| 65 " (km " + ref + ")"); | |
| 66 segment.setReferencePoint(ref); | |
| 67 } | |
| 60 | 68 |
| 61 double [] values = segment.values; | 69 double [] values = segment.values; |
| 62 | 70 |
| 63 if (numResults == -1) { | 71 if (numResults == -1) { |
| 64 numResults = values.length; | 72 numResults = values.length; |