# HG changeset patch # User Ingo Weinzierl # Date 1303112357 0 # Node ID a8e7c351bdf1849ad1d4cca1956c5cb6147624db # Parent d8558dd64152e1d58276e5e04317419626b0b702 The getGauge() method of the FLYSArtifact returns the first gauge based on the given stationing now. flys-artifacts/trunk@1712 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r d8558dd64152 -r a8e7c351bdf1 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Fri Apr 15 13:47:10 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Apr 18 07:39:17 2011 +0000 @@ -1,3 +1,13 @@ +2011-04-18 Ingo Weinzierl + + * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The + getGauge() method returns the first gauge based on the given start and + end point of the river. + + * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: + Fixed potential bugs: if no gauge could be determined, the default + values for W and Q are the minimum and maximum double values. + 2011-04-15 Ingo Weinzierl * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fills diff -r d8558dd64152 -r a8e7c351bdf1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Fri Apr 15 13:47:10 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Mon Apr 18 07:39:17 2011 +0000 @@ -487,10 +487,13 @@ logger.debug("... distance: " + dist[0] + " - " + dist[1]); } - List gauges = river.getGauges(); + Gauge gauge = river.determineGauge(dist[0], dist[1]); + gauge = null; - // TODO Search the desired gauge! - return gauges.get(0); + String name = gauge != null ? gauge.getName() : "'n/a"; + logger.debug("Found gauge: " + name); + + return gauge; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r d8558dd64152 -r a8e7c351bdf1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Fri Apr 15 13:47:10 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Mon Apr 18 07:39:17 2011 +0000 @@ -136,7 +136,7 @@ logger.debug("WQSelect.determineCurrentGauge"); Gauge gauge = ((FLYSArtifact) artifact).getGauge(); - double[] minmaxW = gauge.determineMinMaxW(); + double[] minmaxW = gauge != null ? gauge.determineMinMaxW() : null; double minW = minmaxW != null ? minmaxW[0] : Double.MIN_VALUE; double maxW = minmaxW != null ? minmaxW[1] : Double.MAX_VALUE; @@ -163,7 +163,9 @@ Gauge gauge = flysArtifact.getGauge(); Wst wst = WstFactory.getWst(river); - double[] minmaxQ = wst.determineMinMaxQ(gauge.getRange()); + double[] minmaxQ = gauge != null + ? wst.determineMinMaxQ(gauge.getRange()) + : null; double minQ = minmaxQ != null ? minmaxQ[0] : Double.MIN_VALUE; double maxQ = minmaxQ != null ? minmaxQ[1] : Double.MAX_VALUE;