--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java	Mon Jun 18 09:16:05 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java	Mon Jun 18 11:21:30 2012 +0000
@@ -31,7 +31,6 @@
     /** House logger. */
     private static Logger logger = Logger.getLogger(FixDerivateFacet.class);
 
-    private double currentKm;
     private double maxQ;
 
     /** Trivial Constructor. */
@@ -47,12 +46,6 @@
     }
 
 
-    public Object getData(Artifact artifact, CallContext context, double km) {
-        this.currentKm = km;
-        return getData(artifact, context);
-    }
-
-
     /**
      * Returns the data this facet requires.
      *
@@ -74,6 +67,8 @@
                                                  false);
 
             FixResult result = (FixResult) res.getData();
+            double currentKm =
+                ((Double)context.getContextValue("currentKm")).doubleValue();
 
             String function = access.getFunction();
             Function ff = FunctionFactory.getInstance().getFunction(function);
@@ -83,7 +78,7 @@
             
             // Determine maxQ
             double[] maxQs = params
-                .interpolate("km", this.currentKm, new String [] { "max_q" });
+                .interpolate("km", currentKm, new String [] { "max_q" });
             if(maxQs != null) {
                 maxQ = maxQs[0];
             }