Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java @ 519:4e347624ee7c
Last part to fix gnv/issue153. Now 'Profilschnitte', 'Horizontalschnitte' and 'horizontale Schnittprofile'
all use the same x/y interpolation code.
gnv-artifacts/trunk@613 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 23 Jan 2010 21:16:45 +0000 |
| parents | da21c256a0ba |
| children | 44415ae01ddb |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Sat Jan 23 18:10:34 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Sat Jan 23 21:16:45 2010 +0000 @@ -3,46 +3,51 @@ */ package de.intevation.gnv.state.profile.horizontal; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Locale; - -import org.apache.log4j.Logger; -import org.w3c.dom.Node; +import com.vividsolutions.jts.geom.Coordinate; import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.CallContext; + import de.intevation.gnv.artifacts.cache.CacheFactory; +import de.intevation.gnv.artifacts.context.GNVArtifactContext; + +import de.intevation.gnv.chart.Chart; +import de.intevation.gnv.chart.ChartLabels; +import de.intevation.gnv.chart.HorizontalCrossProfileChart; + import de.intevation.gnv.geobackend.base.DefaultResult; import de.intevation.gnv.geobackend.base.DefaultResultDescriptor; import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.geobackend.base.ResultDescriptor; + import de.intevation.gnv.geobackend.base.query.QueryExecutor; import de.intevation.gnv.geobackend.base.query.QueryExecutorFactory; + import de.intevation.gnv.geobackend.base.query.exception.QueryException; + import de.intevation.gnv.math.Interpolation2D; import de.intevation.gnv.math.LinearMetrics; import de.intevation.gnv.math.Point2d; -import de.intevation.gnv.chart.Chart; -import de.intevation.gnv.chart.ChartLabels; -import de.intevation.gnv.chart.HorizontalCrossProfileChart; import de.intevation.gnv.state.InputData; import de.intevation.gnv.utils.DistanceCalculator; +import de.intevation.gnv.utils.StringUtils; import de.intevation.gnv.utils.WKTUtils; -import de.intevation.gnv.utils.StringUtils; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Locale; -import de.intevation.artifacts.CallContext; +import org.apache.log4j.Logger; import org.jfree.chart.ChartTheme; -import com.vividsolutions.jts.geom.Coordinate; +import org.w3c.dom.Node; /** * @author Tim Englich (tim.englich@intevation.de) @@ -360,8 +365,8 @@ Coordinate coordinate = WKTUtils.toCoordinate(result.getString("SHAPE")); double value = result.getDouble("YORDINATE"); - int iPos = result.getInteger("MEDIAN.MESHPOINT.JPOSITION"); - int jPos = result.getInteger("MEDIAN.MESHPOINT.JPOSITION"); + int iPos = result.getInteger("IPOSITION"); + int jPos = result.getInteger("JPOSITION"); Point2d p = new Point2d( coordinate.x, coordinate.y,