Mercurial > dive4elements > river
changeset 8382:15f4e4785288
merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Mon, 06 Oct 2014 15:33:52 +0200 |
| parents | 592df582e462 (current diff) 6350abaf2a7e (diff) |
| children | 4de385d58a3e |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/discharge-diagram-defaults.xml Mon Oct 06 15:27:20 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagram-defaults.xml Mon Oct 06 15:33:52 2014 +0200 @@ -11,4 +11,5 @@ <processor class="org.dive4elements.river.exports.process.FixWQProcessor" axis="W"/> <processor class="org.dive4elements.river.exports.process.FixDerivedProcessor" axis="W"/> <processor class="org.dive4elements.river.exports.process.SQRelationProcessor" axis="Transport"/> + <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/> </discharge-defaults>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Mon Oct 06 15:27:20 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java Mon Oct 06 15:33:52 2014 +0200 @@ -31,7 +31,7 @@ import org.dive4elements.river.model.River; import org.dive4elements.river.model.TimeInterval; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.RiverUtils; +import org.dive4elements.river.artifacts.access.RiverAccess; import org.dive4elements.river.artifacts.access.RangeAccess; public class ATExporter @@ -93,9 +93,8 @@ return; } - River river = RiverUtils.getRiver(master); - RangeAccess rangeAccess = new RangeAccess(master); - double[] kms = rangeAccess.getLocations(); + River river = new RiverAccess(master).getRiver(); + double[] kms = new RangeAccess(master).getLocations(); Gauge gauge = river.determineGaugeByPosition(kms[0]); if (Math.abs(kms[0] - gauge.getStation().doubleValue()) < 1e-4) {