--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Wed Jun 22 06:51:36 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Wed Jun 22 09:19:16 2011 +0000
@@ -1,7 +1,6 @@
 package de.intevation.flys.artifacts.states;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.log4j.Logger;
 
@@ -24,13 +23,20 @@
 import de.intevation.flys.artifacts.WINFOArtifact;
 
 import de.intevation.flys.artifacts.model.RiverFactory;
+import de.intevation.flys.artifacts.model.WQKms;
+import de.intevation.flys.artifacts.model.CalculationResult;
+import de.intevation.flys.artifacts.model.WaterlevelFacet;
+import de.intevation.flys.artifacts.model.FacetTypes;
 
 import de.intevation.flys.artifacts.resources.Resources;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class LocationDistanceSelect extends RangeState {
+public class LocationDistanceSelect 
+extends      RangeState
+implements   FacetTypes
+{
 
     /** The logger used in this class.*/
     private static Logger logger = Logger.getLogger(LocationDistanceSelect.class);
@@ -309,17 +315,19 @@
     ) {
         WINFOArtifact winfo = (WINFOArtifact)artifact;
 
-        Map<String, double [][]> res;
+        CalculationResult res = old instanceof CalculationResult
+            ? (CalculationResult)old
+            : winfo.getDischargeCurveData();
 
-        if (old instanceof Map<?, ?>) {
-            res = (Map<String, double [][]>)old;
-        }
-        else {
-            res = winfo.getDischargeCurveData();
+        if (facets == null) {
+            return res;
         }
 
-        if (facets != null) {
-            // TODO: Generate facets!
+        WQKms [] wqkms = (WQKms [])res.getData();
+
+        for (int i = 0; i < wqkms.length; ++i) {
+            String name = wqkms[i].getName();
+            facets.add(new WaterlevelFacet(i, DISCHARGE_CURVE, name));
         }