Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java @ 8726:7f1fb07e4e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove misuse of method for determining gauge for a long range.
author Tom Gottfried <tom@intevation.de>
date Wed, 29 Apr 2015 16:36:29 +0200
parents e4606eae8ea5
children 5e38e2924c07
comparison
equal deleted inserted replaced
8725:68827654ea7a 8726:7f1fb07e4e3d
11 import java.util.ArrayList; 11 import java.util.ArrayList;
12 import java.util.List; 12 import java.util.List;
13 13
14 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; 14 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
15 import org.dive4elements.river.artifacts.D4EArtifact; 15 import org.dive4elements.river.artifacts.D4EArtifact;
16 import org.dive4elements.river.artifacts.access.RiverAccess;
16 import org.dive4elements.river.artifacts.model.FacetTypes; 17 import org.dive4elements.river.artifacts.model.FacetTypes;
17 import org.dive4elements.river.artifacts.model.WQKms; 18 import org.dive4elements.river.artifacts.model.WQKms;
18 import org.dive4elements.river.exports.process.MiscDischargeProcessor; 19 import org.dive4elements.river.exports.process.MiscDischargeProcessor;
19 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; 20 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
20 import org.dive4elements.river.jfree.Bounds; 21 import org.dive4elements.river.jfree.Bounds;
23 import org.dive4elements.river.jfree.StickyAxisAnnotation; 24 import org.dive4elements.river.jfree.StickyAxisAnnotation;
24 import org.dive4elements.river.jfree.StyledXYSeries; 25 import org.dive4elements.river.jfree.StyledXYSeries;
25 import org.dive4elements.river.model.Gauge; 26 import org.dive4elements.river.model.Gauge;
26 import org.dive4elements.river.model.River; 27 import org.dive4elements.river.model.River;
27 import org.dive4elements.river.themes.ThemeDocument; 28 import org.dive4elements.river.themes.ThemeDocument;
28 import org.dive4elements.river.utils.RiverUtils;
29 29
30 import org.dive4elements.artifactdatabase.state.State; 30 import org.dive4elements.artifactdatabase.state.State;
31 import org.dive4elements.river.artifacts.GaugeDischargeCurveArtifact; 31 import org.dive4elements.river.artifacts.GaugeDischargeCurveArtifact;
32 32
33 import org.apache.log4j.Logger; 33 import org.apache.log4j.Logger;
82 * Returns the PNP (Datum) of gauge, if at gauge, 0 otherwise. 82 * Returns the PNP (Datum) of gauge, if at gauge, 0 otherwise.
83 */ 83 */
84 public static double getCurrentGaugeDatum(double km, D4EArtifact artifact, double tolerance) { 84 public static double getCurrentGaugeDatum(double km, D4EArtifact artifact, double tolerance) {
85 // Look if there is a gauge at chosen km: 85 // Look if there is a gauge at chosen km:
86 // Get gauge which is defined for km 86 // Get gauge which is defined for km
87 Gauge gauge = 87 Gauge gauge = new RiverAccess(artifact).getRiver()
88 RiverUtils.getRiver(artifact).determineGauge(km-0.1d, km+0.1d); 88 .determineGaugeAtStation(km);
89 if (gauge == null) { 89 if (gauge == null) {
90 log.error("No Gauge could be found at station " + km + "!"); 90 log.error("No Gauge could be found at station " + km + "!");
91 return 0d; 91 return 0d;
92 } 92 }
93 double subtractPNP = 0d; 93 double subtractPNP = 0d;
305 log.debug("DischargeCurveGenerator.doDischargeOut"); 305 log.debug("DischargeCurveGenerator.doDischargeOut");
306 WQKms wqkms = (WQKms) o; 306 WQKms wqkms = (WQKms) o;
307 307
308 String gaugeName = wqkms.getName(); 308 String gaugeName = wqkms.getName();
309 309
310 River river = RiverUtils.getRiver(artifact); 310 River river = new RiverAccess(artifact).getRiver();
311 311
312 if (river == null) { 312 if (river == null) {
313 log.debug("no river found"); 313 log.debug("no river found");
314 return; 314 return;
315 } 315 }
http://dive4elements.wald.intevation.org