Mercurial > dive4elements > river
changeset 8333:be7864b4fabb
Let's be more generous with facet activity of main values.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 26 Sep 2014 10:50:54 +0200 |
| parents | 3baa6290cebf |
| children | 38f57e854977 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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; } }); }