Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java @ 4015:7f8d92873d58
Handle annotationtypes in AnnotationArtifact and -Facet.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2012 10:42:34 +0200 |
| parents | efb067ab2ca4 |
| children |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Tue Oct 02 10:38:39 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Tue Oct 02 10:42:34 2012 +0200 @@ -70,11 +70,17 @@ FastAnnotations fas = LocationProvider.getAnnotations(riverName); + String filterName = annotationArtifact.getFilterName(); + + FastAnnotations.Filter filter = (filterName == null) + ? FastAnnotations.IS_POINT + : new FastAnnotations.NameFilter(filterName); + List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>(fas.size()); for (Iterator<FastAnnotations.Annotation> iter = - fas.filter(FastAnnotations.IS_POINT); iter.hasNext();) { + fas.filter(filter); iter.hasNext();) { FastAnnotations.Annotation fa = iter.next(); xy.add(new StickyAxisAnnotation(