Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/services/FixingsOverviewService.java @ 9415:9744ce3c3853
Rework of fixanalysis computation and dWt and WQ facets. Got rid of strange remapping and bitshifting code by explicitely saving the column information and using it in the facets.
The facets also put the valid station range into their xml-metadata
| author | gernotbelger |
|---|---|
| date | Thu, 16 Aug 2018 16:27:53 +0200 |
| parents | af13ceeba52a |
| children |
comparison
equal
deleted
inserted
replaced
| 9414:096f151a0a9f | 9415:9744ce3c3853 |
|---|---|
| 10 | 10 |
| 11 import org.dive4elements.artifacts.CallMeta; | 11 import org.dive4elements.artifacts.CallMeta; |
| 12 import org.dive4elements.artifacts.GlobalContext; | 12 import org.dive4elements.artifacts.GlobalContext; |
| 13 | 13 |
| 14 import org.dive4elements.artifacts.common.utils.XMLUtils; | 14 import org.dive4elements.artifacts.common.utils.XMLUtils; |
| 15 | |
| 16 import org.dive4elements.river.artifacts.model.FixingsFilterBuilder; | |
| 17 | |
| 18 import org.dive4elements.river.artifacts.model.FixingsOverview.Fixing.Filter; | |
| 19 | |
| 20 import org.dive4elements.river.artifacts.model.Range; | 15 import org.dive4elements.river.artifacts.model.Range; |
| 21 | 16 import org.dive4elements.river.artifacts.model.fixings.FixingColumnFilter; |
| 22 import org.dive4elements.river.artifacts.model.FixingsOverview; | 17 import org.dive4elements.river.artifacts.model.fixings.FixingsFilterBuilder; |
| 23 import org.dive4elements.river.artifacts.model.FixingsOverviewFactory; | 18 import org.dive4elements.river.artifacts.model.fixings.FixingsOverview; |
| 24 | 19 import org.dive4elements.river.artifacts.model.fixings.FixingsOverviewFactory; |
| 25 import org.apache.log4j.Logger; | 20 import org.apache.log4j.Logger; |
| 26 | 21 |
| 27 import org.w3c.dom.Document; | 22 import org.w3c.dom.Document; |
| 28 import org.w3c.dom.Element; | 23 import org.w3c.dom.Element; |
| 29 import org.w3c.dom.NodeList; | 24 import org.w3c.dom.NodeList; |
| 56 FixingsOverview overview = FixingsOverviewFactory.getOverview(river); | 51 FixingsOverview overview = FixingsOverviewFactory.getOverview(river); |
| 57 | 52 |
| 58 if (overview != null) { | 53 if (overview != null) { |
| 59 FixingsFilterBuilder ffb = new FixingsFilterBuilder(data); | 54 FixingsFilterBuilder ffb = new FixingsFilterBuilder(data); |
| 60 Range range = ffb.getRange(); | 55 Range range = ffb.getRange(); |
| 61 Filter filter = ffb.getFilter(); | 56 FixingColumnFilter filter = ffb.getFilter(); |
| 62 overview.generateOverview(document, range, filter); | 57 overview.generateOverview(document, range, filter); |
| 63 } | 58 } |
| 64 else { | 59 else { |
| 65 log.warn("No overview for river '" + river + "' available."); | 60 log.warn("No overview for river '" + river + "' available."); |
| 66 } | 61 } |