diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 2120:f021080cb409

Use improved caching for cross section lines data. flys-artifacts/trunk@3690 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 16 Jan 2012 17:38:39 +0000
parents 51b9899f819d
children d626ae185305
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Mon Jan 16 15:51:46 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Mon Jan 16 17:38:39 2012 +0000
@@ -36,6 +36,7 @@
 import de.intevation.flys.artifacts.model.WQKms;
 import de.intevation.flys.artifacts.model.WstValueTable;
 import de.intevation.flys.artifacts.model.WstValueTableFactory;
+import de.intevation.flys.artifacts.model.FastCrossSectionLine;
 
 import de.intevation.flys.artifacts.states.DefaultState;
 import de.intevation.flys.artifacts.states.LocationDistanceSelect;
@@ -44,7 +45,6 @@
 
 import de.intevation.flys.model.Gauge;
 import de.intevation.flys.model.River;
-import de.intevation.flys.model.CrossSectionLine;
 
 import de.intevation.flys.utils.DoubleUtil;
 import de.intevation.flys.utils.FLYSUtils;
@@ -660,10 +660,10 @@
      * @return an array holding coordinates of points of surface of water (
      *         in the form {{x1, x2} {y1, y2}} ).
      */
-    public double [][] getWaterLines(int idx, CrossSectionLine csl) {
+    public double [][] getWaterLines(int idx, FastCrossSectionLine csl) {
         logger.debug("getWaterLines(" + idx + ")");
 
-        List<Point2D> points = csl.fetchCrossSectionLinesPoints();
+        List<Point2D> points = csl.getPoints();
 
         // Need W at km
         WQKms [] wqkms = (WQKms[]) getWaterlevelData().getData();
@@ -681,7 +681,7 @@
         WQKms triple = wqkms[idx];
 
         // Find index of km.
-        double wishKM = csl.getKm().doubleValue();
+        double wishKM = csl.getKm();
         int old_idx = 0;
 
         if (triple.size() == 0) {

http://dive4elements.wald.intevation.org