# HG changeset patch
# User "Tom Gottfried <tom@intevation.de>"
# Date 1411721454 -7200
# Node ID be7864b4fabbd5db4d2eeeccc8095ef8b50f61ab
# Parent  3baa6290cebf341354474a97142f2ee26b0ffd82
Let's be more generous with facet activity of main values.

diff -r 3baa6290cebf -r be7864b4fabb artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java	Fri Sep 26 10:17:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java	Fri Sep 26 10:50:54 2014 +0200
@@ -104,12 +104,10 @@
             + artifact.identifier());
 
         D4EArtifact flys = (D4EArtifact) artifact;
-        // TODO issue880: make annotations available _per type_
         importData(flys, "river");
 
         List<Facet> fs = new ArrayList<Facet>();
 
-        // TODO Add CallMeta (duplicate TODO in RiverAxisArtifact.java).
         DefaultState state = (DefaultState) getCurrentState(context);
         state.computeInit(this, hash(), context, meta, fs);
 
diff -r 3baa6290cebf -r be7864b4fabb artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java	Fri Sep 26 10:17:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java	Fri Sep 26 10:50:54 2014 +0200
@@ -79,11 +79,11 @@
                     Facet    facet,
                     String   outputName
                 ) {
-                    return outputName.equals("computed_discharge_curve")
-                        || outputName.equals("duration_curve")
-                        || outputName.equals("discharge_curve")
-                        || outputName.equals("fix_wq_curve")
-                        || outputName.equals("historical_discharge_wq");
+                    if (facet.getName().equals(MAINVALUES_Q) ||
+                        facet.getName().equals(MAINVALUES_W)) {
+                        return Boolean.TRUE;
+                    }
+                    return null;
                 }
             });
     }