--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java	Fri Nov 01 12:12:24 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java	Fri Nov 01 13:25:54 2013 +0100
@@ -20,7 +20,6 @@
 import org.dive4elements.artifactdatabase.state.DefaultFacet;
 
 import org.dive4elements.river.artifacts.MainValuesArtifact;
-import org.dive4elements.river.artifacts.math.Linear;
 import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StickyAxisAnnotation;
 import org.dive4elements.river.exports.fixings.FixChartGenerator;
@@ -54,35 +53,15 @@
      * Employ linear interpolation.
      */
     protected static void setHitPoint(WQDay wqday, StickyAxisAnnotation annotation) {
-
-        if (wqday.size() == 0) {
-            return;
-        }
+        float w = annotation.getPos();
 
-        int idx = 0;
-        float w = annotation.getPos();
-        boolean wIncreases = wqday.getW(0) < wqday.getW(wqday.size()-1);
-        if (wIncreases) {
-            while (idx < wqday.size() && wqday.getW(idx) < w) {
-                idx++;
-            }
+        Double day = wqday.interpolateDayByW(w);
+
+        if (day != null) {
+            annotation.setHitPoint(day.floatValue());
         }
-        else {
-            idx = wqday.size() -1;
-            while (idx > 0 && wqday.getW(idx) > w) {
-                idx--;
-            }
-        }
-
-        double day = 0d;
-        int mod = (wIncreases) ? -1 : +1;
-        if (idx != 0 && idx < wqday.size()-1-mod) {
-            day = Linear.linear(w, wqday.getW(idx +mod), wqday.getW(idx),
-                wqday.getDay(idx+mod), wqday.getDay(idx));
-            annotation.setHitPoint((float)day);
-        }
-        else {
-            logger.debug("StickyAnnotation does not hit wqday curve");
+        else if (logger.isDebugEnabled()) {
+            logger.debug("StickyAnnotation does not hit wqday curve: " + w);
         }
     }