Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java @ 3753:b3fdb5a12613
Add also min and max q values to the river info.
flys-artifacts/trunk@5448 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Bjoern Ricks <bjoern.ricks@intevation.de> |
---|---|
date | Thu, 13 Sep 2012 09:09:44 +0000 |
parents | 99f80469ba2b |
children | a5f65e8983be |
comparison
equal
deleted
inserted
replaced
3752:854666f70a80 | 3753:b3fdb5a12613 |
---|---|
54 ArtifactNamespaceContext.NAMESPACE_URI, | 54 ArtifactNamespaceContext.NAMESPACE_URI, |
55 ArtifactNamespaceContext.NAMESPACE_PREFIX); | 55 ArtifactNamespaceContext.NAMESPACE_PREFIX); |
56 | 56 |
57 Element go = ec.create("gauge-info"); | 57 Element go = ec.create("gauge-info"); |
58 | 58 |
59 double[] minmax = river.determineMinMaxDistance(); | 59 double[] minmax = river.determineMinMaxDistance(); |
60 double[] minmaxq = river.determineMinMaxQ(); | |
60 | 61 |
61 Element r = ec.create("river"); | 62 Element r = ec.create("river"); |
62 ec.addAttr(r, "name", river.getName(), true); | 63 ec.addAttr(r, "name", river.getName(), true); |
63 ec.addAttr(r, "start", Double.toString(minmax[0]), true); | 64 ec.addAttr(r, "start", Double.toString(minmax[0]), true); |
64 ec.addAttr(r, "end", Double.toString(minmax[1]), true); | 65 ec.addAttr(r, "end", Double.toString(minmax[1]), true); |
65 ec.addAttr(r, "wstunit", river.getWstUnit().getName(), true); | 66 ec.addAttr(r, "wstunit", river.getWstUnit().getName(), true); |
66 ec.addAttr(r, "kmup", Boolean.toString(river.getKmUp()), true); | 67 ec.addAttr(r, "kmup", Boolean.toString(river.getKmUp()), true); |
67 //TODO | 68 ec.addAttr(r, "minq", Double.toString(minmaxq[0]), true); |
68 /* ec.addAttr(r, "qmin", , true); */ | 69 ec.addAttr(r, "maxq", Double.toString(minmaxq[1]), true); |
69 /* ec.addAttr(r, "qmax", , true); */ | |
70 | 70 |
71 Element egs = ec.create("gauges"); | 71 Element egs = ec.create("gauges"); |
72 | 72 |
73 List<Gauge> gauges = river.getGauges(); | 73 List<Gauge> gauges = river.getGauges(); |
74 | 74 |
94 ec.addAttr(eg, "datum", datum, true); | 94 ec.addAttr(eg, "datum", datum, true); |
95 } | 95 } |
96 | 96 |
97 Range range = gauge.getRange(); | 97 Range range = gauge.getRange(); |
98 if (range != null) { | 98 if (range != null) { |
99 double min = range.getA().doubleValue(); | 99 BigDecimal a = range.getA(); |
100 ec.addAttr(eg, "start", Double.toString(min), true); | 100 if (a != null) { |
101 double min = a.doubleValue(); | |
102 ec.addAttr(eg, "start", Double.toString(min), true); | |
103 } | |
101 | 104 |
102 BigDecimal b = range.getB(); | 105 BigDecimal b = range.getB(); |
103 if (b != null) { | 106 if (b != null) { |
104 double max = range.getB().doubleValue(); | 107 double max = range.getB().doubleValue(); |
105 ec.addAttr(eg, "end", Double.toString(max), true); | 108 ec.addAttr(eg, "end", Double.toString(max), true); |