--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Mon Aug 22 13:07:26 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Mon Aug 22 15:25:48 2011 +0000
@@ -23,6 +23,8 @@
 import de.intevation.artifactdatabase.state.State;
 import de.intevation.artifactdatabase.state.StateEngine;
 
+import de.intevation.artifactdatabase.data.StateData;
+
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.flys.artifacts.states.DefaultState;
@@ -35,6 +37,9 @@
 import de.intevation.flys.model.Annotation;
 import de.intevation.flys.artifacts.model.AnnotationsFactory;
 
+import de.intevation.flys.model.River;
+
+import de.intevation.flys.artifacts.model.RiverFactory;
 
 /**
  * Artifact to access names of Points Of Interest along a segment of a river.
@@ -78,7 +83,6 @@
     }
 
 
-    @Override
     public double[] getDistance() {
         /** TODO In initialize(), access maximal range of river (via
          * AnnotationFactory) instead of overriding getDistance, 
@@ -224,6 +228,13 @@
         }
     } 
 
+    public River getRiver() {
+        StateData dRiver = getData("river");
+
+        return dRiver != null
+            ? RiverFactory.getRiver((String) dRiver.getValue())
+            : null;
+    }
 
     /**
      * Get Annotations for Points (opposed to segments) in river in range.