Mercurial > dive4elements > river
changeset 1789:205eb6f124a5
Load and display annotations in w-difference diagrams, minor polishing.
flys-artifacts/trunk@3112 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 28 Oct 2011 12:18:00 +0000 |
| parents | d5d2bffb26ca |
| children | d3a0d55dff63 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java |
| diffstat | 4 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Oct 28 12:09:58 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Oct 28 12:18:00 2011 +0000 @@ -1,3 +1,14 @@ +2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Load and display annotations in w-differences, minor polishing. + + * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, + src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: + Use FacetType 'instead' of string. Allow Annotations in + WDifferences- diagram. + + * doc/conf/meta-data.xml: Recommend annotations in w-differences case. + 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/collections/AttributeWriter.java:
--- a/flys-artifacts/doc/conf/meta-data.xml Fri Oct 28 12:09:58 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Oct 28 12:18:00 2011 +0000 @@ -10,6 +10,12 @@ <dc:elements> <river> <dc:attribute name="name" value="${river_name}"/> + <dc:if test="dc:contains($artifact-outs, 'w_differences')"> + <annotation> + <dc:attribute name="factory" value="annotations"/> + <dc:attribute name="ids" value="${river_id}"/> + </annotation> + </dc:if> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> <dc:choose> <dc:when test="dc:contains($parameters, 'recommended')">
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Fri Oct 28 12:09:58 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Fri Oct 28 12:18:00 2011 +0000 @@ -279,8 +279,7 @@ else if (name.equals(LONGITUDINAL_ANNOTATION)) { doAnnotationsOut(f.getData(artifact, context), facet, attr, visible); } - // TODO -> type, and merge with WDifferencesCurveGenerator - else if (name.equals("other.wkms")) { + else if (name.equals(STATIC_WKMS)) { doWOut((WKms) f.getData(artifact, context), facet, attr, visible); } else if (name.equals(W_DIFFERENCES)) {
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Fri Oct 28 12:09:58 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Fri Oct 28 12:18:00 2011 +0000 @@ -152,9 +152,12 @@ else if (name.equals(LONGITUDINAL_W)) { doWOut((WQKms) f.getData(artifact, context), facet, attr, visible); } - else if (name.equals("other.wkms")) { + else if (name.equals(STATIC_WKMS)) { doWOut((WKms) f.getData(artifact, context), facet, attr, visible); } + else if (name.equals(LONGITUDINAL_ANNOTATION)) { + doAnnotationsOut(f.getData(artifact, context), facet, attr, visible); + } else { logger.warn("Unknown facet name: " + name); return;