Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4014:e5e1331d0440 | 4015:7f8d92873d58 |
|---|---|
| 68 | 68 |
| 69 String riverName = FLYSUtils.getRivername((FLYSArtifact)artifact); | 69 String riverName = FLYSUtils.getRivername((FLYSArtifact)artifact); |
| 70 | 70 |
| 71 FastAnnotations fas = LocationProvider.getAnnotations(riverName); | 71 FastAnnotations fas = LocationProvider.getAnnotations(riverName); |
| 72 | 72 |
| 73 String filterName = annotationArtifact.getFilterName(); | |
| 74 | |
| 75 FastAnnotations.Filter filter = (filterName == null) | |
| 76 ? FastAnnotations.IS_POINT | |
| 77 : new FastAnnotations.NameFilter(filterName); | |
| 78 | |
| 73 List<StickyAxisAnnotation> xy = | 79 List<StickyAxisAnnotation> xy = |
| 74 new ArrayList<StickyAxisAnnotation>(fas.size()); | 80 new ArrayList<StickyAxisAnnotation>(fas.size()); |
| 75 | 81 |
| 76 for (Iterator<FastAnnotations.Annotation> iter = | 82 for (Iterator<FastAnnotations.Annotation> iter = |
| 77 fas.filter(FastAnnotations.IS_POINT); iter.hasNext();) { | 83 fas.filter(filter); iter.hasNext();) { |
| 78 FastAnnotations.Annotation fa = iter.next(); | 84 FastAnnotations.Annotation fa = iter.next(); |
| 79 | 85 |
| 80 xy.add(new StickyAxisAnnotation( | 86 xy.add(new StickyAxisAnnotation( |
| 81 fa.getPosition(), | 87 fa.getPosition(), |
| 82 (float)fa.getA(), | 88 (float)fa.getA(), |