Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 3818:dc18457b1cef
merged flys-artifacts/pre2.7-2012-03-16
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Sep 2012 12:14:59 +0200 |
parents | 804088c2e23a |
children | 3aec5a42696a |
comparison
equal
deleted
inserted
replaced
2456:60ab1054069d | 3818:dc18457b1cef |
---|---|
1 2012-03-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2 | |
3 Circumvent follow-up errors. | |
4 | |
5 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6 Store location where to add to a list to avoid OutOfBounds if a | |
7 error occurred previously. | |
8 | |
9 2012-03-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
10 | |
11 Disable legend entry aggregation in this tag. | |
12 | |
13 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
14 Do not aggregate legend entries. | |
15 | |
16 2012-03-16 Ingo Weinzierl <ingo@intevation.de> | |
17 | |
18 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
19 src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, | |
20 src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
21 Removed useless imports. | |
22 | |
23 2012-03-16 Ingo Weinzierl <ingo@intevation.de> | |
24 | |
25 flys/issue523 (W-INFO / Bezugslinienverfahren / Linieneinstellungen / Min+Max anzeigen) | |
26 | |
27 * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
28 Improved the look of the minimum and maximum shape of a series. They are | |
29 now rectangles with a darker fill color as the line color is. | |
30 | |
31 2012-03-15 Ingo Weinzierl <ingo@intevation.de> | |
32 | |
33 flys/issue522 (W-INFO / Bezugslinienverfahren / Schriftgröße der Achsenbeschriftung) | |
34 | |
35 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, | |
36 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
37 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Label and | |
38 tick label fonts for axes will now always be the same. | |
39 | |
40 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
41 Removed the createYAxis() method which is already implemented in an | |
42 upper class. There, the method also takes the ChartSettings into account. | |
43 | |
44 2012-03-15 Raimund Renkert <raimund.renkert@intevation.de> | |
45 | |
46 Issue 547. | |
47 | |
48 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
49 Use date format with MEDIUM style. | |
50 | |
51 * src/main/java/de/intevation/flys/utils/Formatter.java: | |
52 Added date format with MEDIUM style. | |
53 | |
54 2012-03-15 Ingo Weinzierl <ingo@intevation.de> | |
55 | |
56 * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a new | |
57 method that returns the Bounds for a given XYDataset. Based on the | |
58 concrete type of the XYDataset, the call is dispatched to a more specific | |
59 method. | |
60 | |
61 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
62 Removed the whole "range" stuff and some methods that are implemented in | |
63 upper classes. | |
64 | |
65 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Removed the | |
66 setXRange() and setYRange() methods. In our own code, we will use Bounds | |
67 instead of JFreeChart's Range instances to save range/bounds information. | |
68 This is necessary to save information which is not not from type double | |
69 (which is the case in Timeseries charts). | |
70 | |
71 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Replaced | |
72 usage of Range with Bounds in the whole class. | |
73 | |
74 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
75 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
76 Adapted the method signature of zoom() and zoomX(). | |
77 | |
78 2012-03-14 Ingo Weinzierl <ingo@intevation.de> | |
79 | |
80 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
81 Copied the adjustAxes() method from XYChartGenerator which enables axes | |
82 label font sizes. | |
83 | |
84 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
85 Removed unnecessary axes creation method which is implemented in upper | |
86 classes. | |
87 | |
88 2012-03-14 Raimund Renkert <raimund.renkert@intevation.de> | |
89 | |
90 Issue 640. | |
91 | |
92 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
93 Remove all unnecessary output settings from attributes. | |
94 | |
95 2012-03-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
96 | |
97 Partial for flys/issue358, rough stub for legenditem aggregation. | |
98 | |
99 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
100 Added rough stub for legend aggregation. | |
101 | |
102 2012-03-08 Ingo Weinzierl <ingo@intevation.de> | |
103 | |
104 + doc/conf/themes.xml: Fixed broken XML syntax. | |
105 | |
106 2012-03-08 Ingo Weinzierl <ingo@intevation.de> | |
107 | |
108 * doc/conf/meta-data.xml: Modified the datacage structure of 'floodmaps'. | |
109 | |
110 2012-03-08 Ingo Weinzierl <ingo@intevation.de> | |
111 | |
112 * src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java: New. | |
113 This Artifacts allows loading 'floodmaps'. | |
114 | |
115 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a | |
116 new Facet type "floodmap.floodmaps" which are created by | |
117 WMSFloodmapsArtifact. | |
118 | |
119 * doc/conf/artifacts/winfo.xml: Registered the "floodmap.floodmaps" facet | |
120 for "floodmap" output. | |
121 | |
122 * doc/conf/conf.xml: Registered the new WMSFloodmapsArtifact. | |
123 | |
124 * doc/conf/themes.xml: Added a theme for the "floodmap.floodmaps" facet. | |
125 | |
126 * src/main/resources/messages.properties, | |
127 src/main/resources/messages_de_DE.properties, | |
128 src/main/resources/messages_en.properties, | |
129 src/main/resources/messages_de.properties: Added i18n string for | |
130 "floodmap.floodmaps" title. | |
131 | |
132 2012-03-08 Ingo Weinzierl <ingo@intevation.de> | |
133 | |
134 * doc/conf/meta-data.xml: Improved datacage configuration to serve | |
135 floodmaps. | |
136 | |
137 2012-03-05 Ingo Weinzierl <ingo@intevation.de> | |
138 | |
139 flys/issue566 (ÜSK: Formalien in der Parametrisierung) | |
140 | |
141 * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java: | |
142 Override getLabelFor() method to return better I18N strings for selected | |
143 floodplain option. | |
144 | |
145 * src/main/resources/messages.properties, | |
146 src/main/resources/messages_de_DE.properties, | |
147 src/main/resources/messages_en.properties, | |
148 src/main/resources/messages_de.properties: Added options | |
149 for floodplain (active/inactive) and adapted a german I18N string. | |
150 | |
151 2012-03-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
152 | |
153 Fix flys/issue 528 for csv. | |
154 | |
155 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
156 Fixed column order, reworked todos. | |
157 | |
158 2012-03-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
159 | |
160 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
161 Fixed column order. | |
162 | |
163 2012-03-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
164 | |
165 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
166 Stub to export the "W (cm)" column conditionally on Gauge presence. | |
167 | |
168 2012-03-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
169 | |
170 * src/main/java/de/intevation/flys/exports/StepCSVWriter.java: | |
171 New utility to handle csv rows of more "dynamical" length. | |
172 | |
173 2012-03-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
174 | |
175 * src/main/java/de/intevation/flys/exports/StepCSVWriter.java: | |
176 New utility to handle csv rows of more "dynamical" length. | |
177 | |
178 2012-03-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
179 | |
180 Fix flys/issue501 (manual points have two legend entries). | |
181 | |
182 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
183 Respect wish to not have a legend entry. | |
184 | |
185 2012-03-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
186 | |
187 Fix flys/issue636 (cross-section: name of waterlevel facets). | |
188 | |
189 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
190 Corrected name for waterlevel facets. | |
191 | |
192 2012-03-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
193 | |
194 Partial fix flys/issue615 (datacage: events for fixations). | |
195 | |
196 * doc/conf/meta-data.xml: Adjusted to make loading single events | |
197 possible. | |
198 | |
199 2012-03-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
200 | |
201 Partial Dontcrash on flys/issue647 (NaNs from WstValueTable interpolation). | |
202 | |
203 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
204 Do not add data pairs where a NaN is present. | |
205 | |
206 2012-03-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
207 | |
208 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
209 Cosmetics, doc. | |
210 | |
211 2012-02-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
212 | |
213 Added functions to be used for fitting in | |
214 the "Fixierungsanalyse" and "Extremwertermittlung". | |
215 | |
216 * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: New. | |
217 Abstract base class for functions to fit. Provides the name of the function, | |
218 a short description, the names of the parameters and an initial parameter guess | |
219 for the fit processe. Sub classes have to overwite the function evaluation and | |
220 the partial derivative of the function in respect to the parameters. | |
221 | |
222 TODO: Add a meachnism for the inverse function (needed for AT export) and | |
223 the first derivative (needed for the respective diagram). | |
224 | |
225 * src/main/java/de/intevation/flys/artifacts/math/fitting/FunctionFactory.java: | |
226 New. Factory to fetch a function by its name. | |
227 | |
228 * src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java: New. | |
229 exp: W(Q) = m * a^Q + b | |
230 | |
231 * src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java: New. | |
232 quad: W(Q) = n*Q^2 + m*Q + b | |
233 | |
234 * src/main/java/de/intevation/flys/artifacts/math/fitting/Linear.java: New. | |
235 linear: W(Q) = m*Q + b | |
236 | |
237 * src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java: New. | |
238 log-linear: W(Q) = a*ln(m*Q + b) | |
239 | |
240 * src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java: New | |
241 log: W(Q) = m*ln(Q + b) | |
242 | |
243 * src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java: New. | |
244 pow: W(Q) = a*Q^c + d | |
245 | |
246 !!! This power function is new in the pool of functions to be fit. !!! | |
247 See my mail "Manuelle Punkte in der Fixierungsanalyse" 2011-10-27 for details. | |
248 The function exp-new found in the old FLYS function pool is omitted | |
249 because it is worthless and was maybe never used. | |
250 | |
251 * src/main/java/de/intevation/flys/artifacts/math/fitting/App.java: New. | |
252 Small test driver to check if the fitting is working. The points to | |
253 fit are read from stdin the function to fit is determined by the | |
254 system property 'function'. Example usage: | |
255 | |
256 $ mvn -e \ | |
257 -Dfunction=linear \ | |
258 -Dexec.mainClass=de.intevation.flys.artifacts.math.fitting.App exec:java <<EOF | |
259 357.390696917 7546.72096163 | |
260 61.4291036312 1334.54835721 | |
261 799.962128234 16836.7698076 | |
262 126.52761023 2703.69789985 | |
263 900.448553398 18955.0578748 | |
264 EOF | |
265 | |
266 2012-02-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
267 | |
268 * src/main/resources/messages_de.properties: | |
269 Added ommitted translations. | |
270 | |
271 2012-02-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
272 | |
273 fix flys/issue638. | |
274 | |
275 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java | |
276 (doArea): Ract to WKms as upper/lower area data again. | |
277 | |
278 2012-02-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
279 | |
280 Partial fix flys/issue637. | |
281 | |
282 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java, | |
283 src/main/resources/messages.properties, | |
284 src/main/resources/messages_de_DE.properties, | |
285 src/main/resources/messages_en.properties, | |
286 src/main/resources/messages_de.properties: | |
287 Modified translations. | |
288 | |
289 2012-02-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
290 | |
291 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: | |
292 - Calculate the extent of the river by the extents of the fixings. | |
293 Reason: The river Elbe has only has fixings up to km 351. The other half | |
294 of the river is empty which results in a sparse looking overview. | |
295 - Add the name of the river as name attribute to resulting <river> element. | |
296 | |
297 * contrib/fixoverview2html.xsl: New. Demo XSL transformation to turn | |
298 the output of the overview service directly into HTML. Used in the | |
299 client a variant of this script could be used for producing the content | |
300 of the assistance widget. Usage: | |
301 | |
302 $ curl http://localhost:8181/service/fixings-overview \ | |
303 -d @fix-overview.xml | \ | |
304 xsltproc contrib/fixoverview2html.xsl - \ | |
305 > fixings-overview.html | |
306 | |
307 2012-02-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
308 | |
309 * src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: | |
310 Made the filter mechanisms available via the incoming XML document. | |
311 | |
312 1 - range: Simply add a <range from="..." to="..."/> element next to the | |
313 <river> element. Optional. Defaults to full extent. | |
314 | |
315 2 - filters: Add a <filter> element next to the <river> element. | |
316 Optional. Defaults to accepting all. | |
317 The <filter> element can contain the following elements: | |
318 | |
319 <column cid="..."/>: Creates an IdFilter. | |
320 <date when="..."/>: Creates a DateFilter. | |
321 <date-range from="..." to="..."/>: Creates a DateRangeFilter. | |
322 <sector-range from="..." to="..."/>: Create a SectorRangeFilter. | |
323 <not>...</not>: Creates a NotFilter. The nested element is negated. | |
324 <and>...</and>: Create an AndFilter: The nested elements are 'and'ed. | |
325 <or>...</or>: Create an OrFilter: The nested elements are 'or'ed. | |
326 | |
327 These filters need testing! | |
328 | |
329 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: | |
330 Made date format a public constant. | |
331 | |
332 2012-02-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
333 | |
334 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: | |
335 Added a filter mechanism for generating output. | |
336 | |
337 There are two kinds of filters: | |
338 | |
339 1 - A range. Defaults to [-Double.MAX_VALUE, Double.MAX_VALUE] | |
340 The resulting sectors are cut to this range. Sectors outside | |
341 this range are omitted. | |
342 | |
343 2 - column filters: Given a fixing column they can decide to keep | |
344 or not to keep it. Following filters exist: | |
345 | |
346 - IdFilter: Keep column if column id matches. | |
347 - DateFilter: Keep column if column date matches. | |
348 - DateRangeFilter: Keep column if column date is in range. | |
349 - SectorRangeFilter: Keep colum if one of its q sectors is in given range. | |
350 - NotFilter: Negates another nested filter. | |
351 - AndFilter: Keep column if all nested filters accept column. | |
352 - OrFilter: Keep column if at least one of the nested filters accepts it. | |
353 | |
354 2012-02-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
355 | |
356 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: | |
357 Refactored to build the Q sectors once at construction time and not | |
358 every time output is generated. | |
359 This will ease the job of applying filters to the Overview. | |
360 | |
361 2012-02-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
362 | |
363 Service to generate the data needed to build the "Fixerungen pro Fluss Uebersicht" | |
364 | |
365 * src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: | |
366 New. A service that serves an XML overview version of the fixings of a given river. | |
367 | |
368 The input documents look like this: | |
369 | |
370 <?xml version="1.0" encoding="UTF-8"?> | |
371 <fixings> | |
372 <river name="Saar"/> | |
373 </fixings> | |
374 | |
375 The output documents looks like this: | |
376 | |
377 <?xml version="1.0" encoding="UTF-8"?> | |
378 <fixings> | |
379 <river from="0.0" rid="1" to="93.0"/> | |
380 <events> | |
381 ... | |
382 <event cid="85" date="29.01.1995 00:00" name="Fixierungen/0-93_1988-2001.wst"> | |
383 <sector class="0" from="82.7" to="92.85"/> | |
384 </event> | |
385 <event cid="86" date="13.11.1996 00:00" name="Fixierungen/0-93_1988-2001.wst"> | |
386 <sector class="2" from="0.0" to="50.599999"/> | |
387 <sector class="1" from="50.6" to="65.89"/> | |
388 </event> | |
389 ... | |
390 </events> | |
391 </fixings> | |
392 | |
393 The <river> element contains the extent of the whole river | |
394 and its db id. | |
395 The <events> sections contains serveral <event> elements. | |
396 They have a meassure date, db id, a name and a number of <sector>s. | |
397 These sectors are q classified from/to ranges. Classes are: | |
398 | |
399 0: smaller (MNQ+MQ)/2 | |
400 1: (MNQ+MQ)/2 to (MQ+MHQ)/2 | |
401 2: (MQ+MHQ)/2 to HQ5 | |
402 3: greater HQ5 | |
403 | |
404 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: | |
405 New. Cacheable instance of the overview. | |
406 TODO: Apply a filter mechanism when generating the output. | |
407 | |
408 * src/main/java/de/intevation/flys/artifacts/model/FixingsOverviewFactory.java: | |
409 New. Fetched the fixing overviews from cache if configured. | |
410 | |
411 * doc/conf/conf.xml: Added the service. | |
412 * doc/conf/cache.xml: Configured the cache for the fixing overviews. | |
413 | |
414 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
415 | |
416 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxQ): | |
417 Argh! Forget to check in the range method. | |
418 | |
419 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
420 | |
421 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxQ): | |
422 Symmetrical to getMinMaxW() add two methods to find min/max Q for a given | |
423 km or a range. The range method is maybe a bit slow. | |
424 | |
425 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
426 | |
427 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): | |
428 Added signature to give w extend for a given km range. | |
429 | |
430 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
431 | |
432 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): | |
433 Added method to find the w extent for a given km. Useful | |
434 for validating "W auf freier Strecke". | |
435 | |
436 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
437 Removed superfluous import. | |
438 | |
439 2012-02-17 Raimund Renkert <raimund.renkert@intevation.de> | |
440 | |
441 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
442 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
443 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
444 src/main/java/de/intevation/flys/utils/FLYSUtils.java, | |
445 doc/conf/artifacts/winfo.xml: | |
446 Renamed state data fields: wq_mode -> wq_isq | |
447 wq_free -> wq_isfree | |
448 wq_selection -> wq_isrange | |
449 | |
450 2012-02-17 Raimund Renkert <raimund.renkert@intevation.de> | |
451 | |
452 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
453 Write the description instead of the Q value to CSV file. | |
454 | |
455 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
456 Added parameter to overriden method. | |
457 | |
458 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
459 Get Qs without range. | |
460 | |
461 * src/main/resources/messages.properties, | |
462 src/main/resources/messages_de_DE.properties, | |
463 src/main/resources/messages_en.properties, | |
464 src/main/resources/messages_de.properties: | |
465 Adjusted i18n string for CSV metadata. | |
466 | |
467 2012-02-17 Ingo Weinzierl <ingo@intevation.de> | |
468 | |
469 Part II/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) | |
470 | |
471 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
472 Apply legend specific settings (show/hide). | |
473 | |
474 2012-02-17 Ingo Weinzierl <ingo@intevation.de> | |
475 | |
476 Part I/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) | |
477 | |
478 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
479 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved | |
480 adjustPlot() from XYChartGenerator to ChartGenerator which enables the | |
481 TimeseriesChartGenerator to call this method as well. | |
482 | |
483 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
484 Call adjustPlot() in generateChart() to apply the settings specific to | |
485 gridlines in the timeseries plot. | |
486 | |
487 2012-02-16 Raimund Renkert <raimund.renkert@intevation.de> | |
488 | |
489 Refactored the wq data fields. | |
490 | |
491 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
492 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
493 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
494 Changed the wq data fields to boolean values. | |
495 | |
496 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
497 Changed the wq data fields to boolean values and added method that | |
498 returns the km input mode. | |
499 | |
500 2012-02-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
501 | |
502 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
503 Fixed W->Q conversion for "W fuer ungleichwertige Abflusslaengsschnitte." | |
504 | |
505 2012-02-16 Ingo Weinzierl <ingo@intevation.de> | |
506 | |
507 flys/issue509 (Dauerlinie: Q-Achse sollte bei 0 beginnen) | |
508 | |
509 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
510 Set the lower bounds of the Q axis to 0 to avoid displaying negative | |
511 discharge values. | |
512 | |
513 2012-02-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
514 | |
515 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
516 src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
517 (guessWaterIncreasing): Removed from interface. | |
518 | |
519 2012-02-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
520 | |
521 Fix flys/issue150 (exposure of gravitational anomalies) | |
522 | |
523 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
524 src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
525 (guessWaterIncreasing): In analogy to W->WQ->WQKms defined and | |
526 implemented. | |
527 | |
528 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
529 (needInvertAxis): Changed Parameter type to WKms (was WQKms). | |
530 (doW): Use in this case weaker wkms cast to find out whether axis | |
531 has to be inverted. | |
532 | |
533 2012-02-15 Ingo Weinzierl <ingo@intevation.de> | |
534 | |
535 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: Fixed | |
536 SQL statement to fetch hyk formations for rivers with 'km_up' = 0. | |
537 | |
538 2012-02-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
539 | |
540 Another partial fix for flys/issue499: Do the W to Q conversions | |
541 needed for "W am Pegel" correctly. | |
542 | |
543 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
544 Repaired getQsForW(): The mapping from W to Q is not unique! There | |
545 could be more then one Q having the the same W. | |
546 Ws are not strictly monoton/sorted so doing a binary search on this | |
547 is just a fail. We now scan them linearly. | |
548 | |
549 XXX: The whole class is mess. The scaling stuff is a stupid | |
550 and there is no caching. | |
551 | |
552 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
553 Fetch the master discharge table for converting Ws to Qs. Handle | |
554 the case that there are more Qs for a given W. | |
555 | |
556 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java, | |
557 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
558 Adjusted to new semantic. | |
559 | |
560 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
561 | |
562 Partial Fix flys/issue500: text-orientation for texts. | |
563 | |
564 * doc/conf/themes.xml: Change default text orientation for text | |
565 annotations. | |
566 | |
567 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
568 Minor cosmetics. | |
569 | |
570 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
571 Parse and apply text rotation field. | |
572 | |
573 2012-02-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
574 | |
575 Partial fix for flys/issue499 (Wasserspiegellagen: Berechnung für W frei und Pegel kaputt) | |
576 There are still validation issue in the client. | |
577 | |
578 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
579 Fixed state evaluation for "W auf freier Strecke"/"W am Pegel". | |
580 There is still an issue in the client with the input validation | |
581 which prevents entering the right W values for | |
582 "W auf freier Strecke". :-/ | |
583 | |
584 2012-02-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
585 | |
586 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
587 Make it compilable again. | |
588 | |
589 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
590 | |
591 Partial Fix flys/issue500: text-backgrounds for manual points. | |
592 | |
593 * doc/conf/themes.xml: Added text-related style items to manual | |
594 point themes. | |
595 | |
596 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
597 | |
598 Partial Fix flys/issue500 | |
599 | |
600 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
601 Parse whether to show text background. Apply to textannotation. | |
602 | |
603 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
604 | |
605 Fix flys/issue490 | |
606 | |
607 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
608 Pass artifact and facet for doAnnotation. | |
609 | |
610 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
611 | |
612 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
613 Use AddScaleFunction instead of LinearFunction. | |
614 | |
615 * src/main/java/de/intevation/flys/artifacts/math/AddScaleFunction.java: | |
616 New. f(x) = m*(x+b). I know its aequivalent to m*x + m*b but it | |
617 makes more clear that the datum [m] (PNP) is substracted before the | |
618 scaling to cm is done. | |
619 | |
620 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
621 | |
622 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Bugfix: take | |
623 care on empty ArtifactAndFacet objects in doAnnotations(). | |
624 | |
625 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
626 | |
627 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: | |
628 Inherits from ReferenceCurveGenerator now which really simplifies it a lot. | |
629 | |
630 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
631 Added to methods to be overwritten by sub classes. | |
632 | |
633 * src/main/resources/messages.properties, | |
634 src/main/resources/messages_de_DE.properties, | |
635 src/main/resources/messages_en.properties, | |
636 src/main/resources/messages_de.properties: Adjusted i8n. | |
637 | |
638 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
639 | |
640 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
641 Indexed access to getInCm. | |
642 | |
643 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
644 Simplified. Do not provide any data to blackboard. Only side effect the | |
645 call context. | |
646 | |
647 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
648 Added convinience method to i18n string with defaulting to key name. | |
649 | |
650 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
651 Label the axis according the scale types of the data. | |
652 TODO: Let the NormalizedReferenceCurveGenerator be a sub class of | |
653 this. | |
654 | |
655 * src/main/resources/messages.properties, | |
656 src/main/resources/messages_de_DE.properties, | |
657 src/main/resources/messages_en.properties, | |
658 src/main/resources/messages_de.properties: i18n for the reference curve axes. | |
659 | |
660 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
661 | |
662 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
663 Fixed wrong double array dimension for PDF exports and write correct | |
664 differences into PDF. | |
665 | |
666 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
667 | |
668 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
669 src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
670 Adjust function to deliver data provider ('blackboard') keys. | |
671 | |
672 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
673 Change the way we exploit the blackboard-mechanism. TODOs added. | |
674 | |
675 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
676 | |
677 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
678 Argh! Finally found the stupid bug in the W~W relation: | |
679 Used iQ1 index on W2(Q2). | |
680 | |
681 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
682 | |
683 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
684 Improved error messsages even more. | |
685 | |
686 * src/main/resources/messages.properties, | |
687 src/main/resources/messages_de_DE.properties, | |
688 src/main/resources/messages_en.properties, | |
689 src/main/resources/messages_de.properties: Adjusted messages. | |
690 | |
691 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
692 | |
693 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
694 Forget to put new created WWAxisType onto blackboard. | |
695 | |
696 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
697 | |
698 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
699 Adjust offset of linear function by same factor as the values. | |
700 | |
701 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
702 | |
703 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Write | |
704 correct min and max values for date axes into the info document. | |
705 | |
706 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
707 Enabled zooming for timeseries charts. | |
708 | |
709 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
710 | |
711 * src/main/java/de/intevation/flys/jfree/Bounds.java, | |
712 src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
713 src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Added a method | |
714 applyBounds(ValueAxis, int) that might be used to adapt the range of the | |
715 axis to the bounds adding a space to the left and right. | |
716 | |
717 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
718 | |
719 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined | |
720 new abstract methods for setting and getting Bounds. Modified and | |
721 renamed getValueAxisRange(). This method is now called | |
722 getValueAxisRangeFromRequest() and returns no longer a Range object but | |
723 a String array that consists of the raw string values speicified in the | |
724 request document. | |
725 | |
726 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
727 Implemented the missing method getDomainAxisRange(). This method returns | |
728 a Range object based on the String array returned from | |
729 getValueAxisRangeFromRequest(). | |
730 | |
731 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
732 | |
733 * src/main/java/de/intevation/flys/jfree/TimeBounds.java: Added new | |
734 methods getLowerAsDate() and getUpperAsDate(). The toString() method | |
735 will now return a string that contains a human readable date string. | |
736 | |
737 * src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Made 'lower' | |
738 always be smaller than 'upper' in the default constructor. | |
739 | |
740 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
741 | |
742 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
743 Give more precise message when an error occurs in W~W relation. | |
744 | |
745 * src/main/resources/messages.properties, | |
746 src/main/resources/messages_de_DE.properties, | |
747 src/main/resources/messages_en.properties, | |
748 src/main/resources/messages_de.properties: | |
749 Improved error messages. | |
750 | |
751 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
752 | |
753 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Modified | |
754 and renamend getDomainAxisRange(). This method is now called | |
755 getDomainAxisRangeFromRequest() and returns no longer a Range object but | |
756 a String array that consists of the raw string values specified in the | |
757 request document. | |
758 | |
759 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
760 Implemented the missing method getDomainAxisRange(). This method returns | |
761 a Range object based on the String array returned from | |
762 getDomainAxisRangeFromRequest(). | |
763 | |
764 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
765 | |
766 * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a | |
767 helper function to determine the min and max bounds (x and y) for | |
768 TimeSeriesCollections. | |
769 | |
770 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
771 | |
772 * src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
773 src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Removed | |
774 useless imports. | |
775 | |
776 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
777 | |
778 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
779 Add accessors to relative heights. | |
780 | |
781 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
782 Add relative heights (to gauge) to csv export. | |
783 | |
784 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
785 | |
786 * pom.xml: Added dependency to GeoTools swing module. | |
787 | |
788 * src/main/java/de/intevation/flys/artifacts/map/PrintMap.java: Standalone | |
789 demo application to print WMS layers to file. | |
790 | |
791 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
792 | |
793 * src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
794 src/main/java/de/intevation/flys/jfree/DoubleBounds.java, | |
795 src/main/java/de/intevation/flys/jfree/Bounds.java: New model classes that | |
796 should be used for adapting axes ranges later. | |
797 | |
798 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
799 | |
800 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
801 Generate a valid intial i18n name. | |
802 | |
803 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
804 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
805 Pass call context to calculation. | |
806 | |
807 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
808 | |
809 flys/issue485 (Themen können umgenannt werden, dies wird nicht in der Legende reflektiert) | |
810 | |
811 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
812 Use ArtifactAndFacet.setFacetDescription() to set the description for | |
813 themes which are stored in the Collection's XML attribute. | |
814 | |
815 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
816 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
817 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
818 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
819 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
820 src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, | |
821 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
822 src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
823 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
824 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
825 Some refactoring of doXXXOut() methods. We pass the ArtifactAndFacet | |
826 objects of doOut() into those concrete doOut() methods which allows us to | |
827 generate series names for chart curves. | |
828 | |
829 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
830 | |
831 * doc/conf/meta-data.xml: Replaced dashes by underscores in entities | |
832 to ease translation. | |
833 | |
834 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
835 | |
836 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
837 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
838 Fixed problem with including Y-Zeros. | |
839 | |
840 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
841 src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
842 Removed superfluous imports. | |
843 | |
844 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
845 | |
846 Allow points in "new chart"s. | |
847 | |
848 * doc/conf/artifacts/chart.xml: Added manualpoint facets to | |
849 compatibility lists. | |
850 | |
851 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
852 | |
853 * src/main/java/de/intevation/flys/jfree/Style.java: New. A Style object | |
854 needs to implements a method applyTheme() which takes a | |
855 XYLineAndShapeRenderer. | |
856 | |
857 * src/main/java/de/intevation/flys/jfree/XYStyle.java: New. This subclass of | |
858 Style modifies the XYLineAndShapeRenderer specified in applyTheme(). | |
859 | |
860 * src/main/java/de/intevation/flys/jfree/StyledSeries.java: New. This | |
861 interface defines two methods getStyle() and setStyle() to adjust and | |
862 retrieve the Style of a series. | |
863 | |
864 * src/main/java/de/intevation/flys/jfree/StyledTimeSeries.java: New. | |
865 Implementation of StyledSeries that subclasses JFreeChart's TimeSeries. | |
866 | |
867 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Removed the | |
868 code for adapting a XYLineAndShapeRenderer. Instead of implementing this | |
869 stuff in StyledXYSeries itself, this instance now implements StyledSeries | |
870 and stores an instance of XYStyle. | |
871 | |
872 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
873 Create new instances of StyledTimeSeries now which enables styling in this | |
874 chart. | |
875 | |
876 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Enabled | |
877 styling of series for all series that implement StyledSeries. | |
878 | |
879 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
880 | |
881 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
882 Be more conservative about arrays and indices in "Bezugslinienverfahren". | |
883 | |
884 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
885 | |
886 Allow areas in new chart/longitudinal_section. | |
887 | |
888 * doc/conf/artifacts/chart.xml: Added area facet to compatibility | |
889 list. | |
890 | |
891 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
892 | |
893 Fix flys/issue490. Allow CollisionFree..Annotations to collide with | |
894 non-collision-free annotations. | |
895 | |
896 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotationEntity.java: | |
897 New, to take advantage of cheap instanceof operator. | |
898 | |
899 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
900 Only avoid collisions with members of same family (i.e. allow | |
901 collision with annotations of other types). | |
902 | |
903 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
904 | |
905 * doc/conf/themes.xml: Added themes for historical discharge curves and | |
906 the differences to a reference curve. | |
907 | |
908 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
909 | |
910 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Some | |
911 bugfixes and improvements: | |
912 1) take only historical discharge tables into account for calculation | |
913 2) use the correct values for computing differences | |
914 3) moved timerange preparation into an own method | |
915 | |
916 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
917 | |
918 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
919 Fix call to StringUtils.join . | |
920 | |
921 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
922 | |
923 * src/main/resources/messages.properties, | |
924 src/main/resources/messages_de_DE.properties, | |
925 src/main/resources/messages_en.properties, | |
926 src/main/resources/messages_de.properties: | |
927 Added i18n string for waterlevels (from datacage). | |
928 | |
929 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
930 | |
931 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
932 Locale-format multiple double values also. | |
933 | |
934 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
935 | |
936 * doc/conf/artifacts/winfo.xml: Registered a new facet for difference curves | |
937 to the historical discharge output. | |
938 | |
939 * src/main/java/de/intevation/flys/artifacts/model/HistoricalWQTimerange.java: | |
940 New model that is able to store a further double value "diff" besides a W, | |
941 Q and a Timerange. | |
942 | |
943 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Create | |
944 new HistoricalWQTimerange instances with difference between the reference | |
945 discharge table and the historical discharge tables. | |
946 | |
947 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New type | |
948 for historical differences. | |
949 | |
950 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Cast | |
951 Timerange array in getTimeranges(). | |
952 | |
953 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeDifferenceFacet.java: | |
954 New Facet for historical discharge difference curves. | |
955 | |
956 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
957 Create new Facets for the difference curves if the processed data are from | |
958 type HistoricalWQTimerange. | |
959 | |
960 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
961 Added doOut() path for difference curves. | |
962 | |
963 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
964 Increased the size of a double array to be able to get results from | |
965 HistoricalWQTimerange. | |
966 | |
967 * src/main/resources/messages.properties, | |
968 src/main/resources/messages_de_DE.properties, | |
969 src/main/resources/messages_en.properties, | |
970 src/main/resources/messages_de.properties: Added translation for warning | |
971 if no reference discharge table was found for the specified gauge. | |
972 | |
973 2012-02-09 Raimund Renkert <raimund.renkert@intevation.de> | |
974 | |
975 Added PDF export to reference curve calculation. | |
976 | |
977 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
978 Added PDF export. | |
979 | |
980 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
981 doc/conf/artifacts/winfo.xml: | |
982 Add facet for PDF export to state. | |
983 | |
984 * src/main/java/de/intevation/flys/artifacts/model/WWQQJRDataSource.java: | |
985 New. Datasource for JasperReports containing reference curve data. | |
986 | |
987 * src/main/resources/messages.properties, | |
988 src/main/resources/messages_de_DE.properties, | |
989 src/main/resources/messages_en.properties, | |
990 src/main/resources/messages_de.properties: | |
991 Added i18n strings for JasperReports template file and calculation mode. | |
992 | |
993 * doc/conf/jasper/reference.jasper, | |
994 doc/conf/jasper/reference_en.jasper: | |
995 New. Templates for reference curve PDF export. | |
996 | |
997 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
998 | |
999 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java(getReferenceEndKms): | |
1000 Prevent duplicates in end kms for reference curve calculation. | |
1001 | |
1002 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1003 | |
1004 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
1005 doc/conf/artifacts/winfo.xml: Renamed data item names to allow | |
1006 translations. | |
1007 | |
1008 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1009 | |
1010 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1011 Give (Normalized)ReferenceCurveFacets are more appropriate | |
1012 description (to be seen in client). | |
1013 | |
1014 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1015 | |
1016 Prepare Reference curves to eat multiple locations as 'Ziel'. | |
1017 | |
1018 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
1019 Cosmetics. | |
1020 | |
1021 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
1022 New. State to provoke multi_location_panel. | |
1023 | |
1024 * doc/conf/artifacts/winfo.xml: Made end state of ref curves a (new) | |
1025 EnterMultipleLocationState. | |
1026 | |
1027 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
1028 | |
1029 flys/issue483 (Historische Abflusstafeln ohne Ergebnis) | |
1030 | |
1031 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add | |
1032 a problem for the calculation report if no discharge tables were found | |
1033 for the given timerange. | |
1034 | |
1035 * src/main/resources/messages.properties, | |
1036 src/main/resources/messages_de_DE.properties, | |
1037 src/main/resources/messages_en.properties, | |
1038 src/main/resources/messages_de.properties: Added translation for error | |
1039 messages created by Calculation6. | |
1040 | |
1041 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1042 | |
1043 * src/main/java/de/intevation/flys/utils/Formatter.java: | |
1044 Format kms in error reports at least with one digit after | |
1045 the decimal separator. | |
1046 | |
1047 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1048 | |
1049 Fix flys/issue468 (Fehler beim Projekt-Duplizieren) | |
1050 | |
1051 * src/main/java/de/intevation/flys/exports/ReportGenerator.java: | |
1052 Always create a new XML document when calling report generation. | |
1053 XXX: There is a bug somewhere which calls error reporting twice | |
1054 when cloning a collection. Speculation: It has something to do with | |
1055 the settings stuff. | |
1056 | |
1057 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
1058 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1059 Remove superfluous imports. | |
1060 | |
1061 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: | |
1062 Added missing Override annotation. | |
1063 | |
1064 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1065 | |
1066 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
1067 Handle Manual Point Facets, added TODO. | |
1068 | |
1069 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1070 | |
1071 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
1072 Subclass BlackboardDataFacet to repair areas over cross sections. | |
1073 | |
1074 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
1075 | |
1076 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Let text | |
1077 and line annotations placed at x or y axes always be in foreground. | |
1078 | |
1079 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1080 | |
1081 Fix flys/issue474 (manual points in reference curves). | |
1082 | |
1083 * doc/conf/artifacts/winfo.xml, | |
1084 doc/conf/artifacts/manualpoints.xml: | |
1085 Add manualpoints to lists just so that really everybody knows. | |
1086 | |
1087 * doc/conf/themes.xml: Add styles for manual points in ref curves. | |
1088 | |
1089 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1090 Add ref curve chart types. | |
1091 | |
1092 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
1093 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1094 Handle manual point facets. | |
1095 | |
1096 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1097 | |
1098 Partial Fix flys/issue474. | |
1099 | |
1100 * src/main/resources/messages.properties, | |
1101 src/main/resources/messages_de_DE.properties, | |
1102 src/main/resources/messages_en.properties, | |
1103 src/main/resources/messages_de.properties: Added translation for | |
1104 normalized_reference_curve. | |
1105 | |
1106 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1107 | |
1108 Fix flys/issue475. | |
1109 | |
1110 * doc/conf/themes.xml: Register theme for reference_curve_normalized. | |
1111 | |
1112 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
1113 | |
1114 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Add a "/" to the | |
1115 URL of the user wms if the URL configured in conf.xml doesn't end with | |
1116 a "/". | |
1117 | |
1118 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1119 | |
1120 Fix flys/issue472. | |
1121 | |
1122 * doc/conf/themes.xml: Added theme for discharge_curve manualpoints. | |
1123 | |
1124 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1125 Added discharge_curve as chart type. | |
1126 | |
1127 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1128 | |
1129 Fix flys/issue484 ((i18n: Ungleichwertige... Report)) | |
1130 | |
1131 * src/main/resources/messages.properties, | |
1132 src/main/resources/messages_de_DE.properties, | |
1133 src/main/resources/messages_en.properties, | |
1134 src/main/resources/messages_de.properties: Fixed key spelling. | |
1135 | |
1136 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1137 | |
1138 Fix flys/issue478 (Manuelle Punkte: Stil nicht änderbar). | |
1139 | |
1140 * doc/conf/themes: Map correct theme to manualpoint themes. | |
1141 | |
1142 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1143 | |
1144 Partial fix flys/issue472 . | |
1145 | |
1146 * doc/conf/artifacts/winfo.xml: Add manual points to compatibility | |
1147 list of cross_sections. | |
1148 | |
1149 * doc/conf/artifacts/manualpoints.xml: Add manualpoints to list of | |
1150 generated facets. | |
1151 | |
1152 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1153 | |
1154 * doc/conf/themes.xml: Commented styling option for show area until | |
1155 area calculation works. | |
1156 | |
1157 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1158 | |
1159 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
1160 i18n the km of the error report. | |
1161 | |
1162 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
1163 Fixed potential race conditions. | |
1164 | |
1165 * src/main/java/de/intevation/flys/utils/Formatter.java: Added | |
1166 formatter for error report kms. | |
1167 | |
1168 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
1169 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
1170 Removed superfluous imports. | |
1171 | |
1172 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
1173 Commented out some imports. They are used be out commented code. | |
1174 | |
1175 2012-02-07 Ingo Weinzierl <ingo@intevation.de> | |
1176 | |
1177 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
1178 Use the correct km key for an unspecific km for fetching the whole river | |
1179 annotations. | |
1180 | |
1181 2012-02-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1182 | |
1183 * doc/conf/conf.xml: Added missing config of chart info generator | |
1184 of normalized reference curve. | |
1185 | |
1186 2012-02-07 Ingo Weinzierl <ingo@intevation.de> | |
1187 | |
1188 * doc/conf/conf.xml: Fixed wrong chart info generator name for historical | |
1189 discharge curves. | |
1190 | |
1191 2012-02-07 Raimund Renkert <raimund.renkert@intevation.de> | |
1192 | |
1193 Added PDF export for historical discharge curve calculations. | |
1194 | |
1195 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
1196 Implemented PDF export for calculation results. | |
1197 | |
1198 * src/main/java/de/intevation/flys/artifacts/model/WQTJRDataSource.java: | |
1199 New. Datasource for JasperReports. | |
1200 | |
1201 * doc/conf/artifacts/winfo.xml: | |
1202 Added facet for PDF export to historical discharge curve output mode. | |
1203 | |
1204 * src/main/resources/messages.properties, | |
1205 src/main/resources/messages_de_DE.properties, | |
1206 src/main/resources/messages_en.properties, | |
1207 src/main/resources/messages_de.properties: | |
1208 Added i18n strings for historical discharge curve export. | |
1209 | |
1210 * doc/conf/jasper/historical-discharge.jasper, | |
1211 doc/conf/jasper/historical-discharge_en.jasper: | |
1212 New. Templates for JasperReports PDF creation. | |
1213 | |
1214 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1215 | |
1216 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
1217 Handle WWQQs, extended CSV export of reference curves. | |
1218 | |
1219 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1220 | |
1221 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
1222 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
1223 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
1224 Recactored, moved Formatter accessors to base class AbstractExporter. | |
1225 | |
1226 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1227 | |
1228 Let reference curve calculation result in specific WWQQ, extended CSV | |
1229 | |
1230 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java | |
1231 (getWW,getWWQQ): Renamed and changed result type. | |
1232 | |
1233 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java, | |
1234 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1235 Result in WWQQs, not in WWs. | |
1236 | |
1237 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1238 | |
1239 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1240 Log error as warning. | |
1241 | |
1242 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1243 | |
1244 * src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java: | |
1245 New. Linear function f(x) = m*x + b. | |
1246 | |
1247 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
1248 Do the normalizing. Cascading functions is not required. | |
1249 | |
1250 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1251 | |
1252 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveInfoGenerator.java: | |
1253 Added missing chart info generator for the normalized reference curves. | |
1254 | |
1255 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1256 | |
1257 * src/main/resources/messages_de_DE.properties, | |
1258 src/main/resources/messages_de.properties: Fix i18n. | |
1259 | |
1260 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1261 | |
1262 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
1263 Added optional boolean flag to indicated if the data should be 'normalized'. | |
1264 TODO: Build the cascading normalising function call chain. | |
1265 | |
1266 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
1267 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1268 Fetch WWAxisTypes from call context to do the right scaling. | |
1269 | |
1270 2012-02-06 Raimund Renkert <raimund.renkert@intevation.de> | |
1271 | |
1272 Added service for discharge infos at a specific gauge. | |
1273 | |
1274 * doc/conf/conf.xml: Added service factory entry. | |
1275 | |
1276 * src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java: | |
1277 New. Returns description, start year and end year of discharges at a | |
1278 specific gauge. | |
1279 | |
1280 * src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: | |
1281 Return a more specific ui provider string. | |
1282 | |
1283 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1284 | |
1285 * doc/conf/conf.xml: Registered generator for normalized reference curves. | |
1286 | |
1287 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1288 Added "reference_curve_normalized". | |
1289 | |
1290 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1291 Added facets for normalized reference curves. | |
1292 | |
1293 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: | |
1294 Generator for normalized reference curves. | |
1295 | |
1296 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1297 | |
1298 * doc/conf/artifacts/winfo.xml: Added config for "reduzierte Bezugslinie". | |
1299 | |
1300 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1301 | |
1302 * doc/conf/artifacts/winfo.xml: Added error report. | |
1303 | |
1304 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
1305 | |
1306 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Set | |
1307 proper bounds for date axis elements; tell the transformation matrix which | |
1308 type it is (number/date). | |
1309 | |
1310 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1311 | |
1312 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
1313 Include location description string in csv output of referencecurve- | |
1314 exporter. | |
1315 | |
1316 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1317 | |
1318 * src/main/java/de/intevation/flys/artifacts/model/WW.java: Added constructor call. | |
1319 * src/main/java/de/intevation/flys/artifacts/model/WWQQ.java: New. | |
1320 Stores the Qs for the Ws, too. | |
1321 | |
1322 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: Create | |
1323 WWQQs instead of WWs. | |
1324 | |
1325 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1326 | |
1327 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
1328 Added further i18n stubs and slightly more data. | |
1329 | |
1330 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1331 | |
1332 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
1333 Return the Qs of the Ws, too. | |
1334 | |
1335 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1336 Adjusted to cope with the return Qs. TODO: Create WQWQ or WWQQ dataset | |
1337 for storing the result. | |
1338 | |
1339 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1340 | |
1341 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1342 Added further i18n stubs. | |
1343 Also added a second Y axis (experimental, to ease axis labeling etc.). | |
1344 | |
1345 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1346 | |
1347 * doc/conf/artifacts/winfo.xml: Register new export output and csv | |
1348 facet for reference curves. | |
1349 | |
1350 * doc/conf/conf.xml: Register Exporter for reference curve. | |
1351 | |
1352 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
1353 Primitive exporter, bland copy of another one. | |
1354 | |
1355 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1356 | |
1357 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1358 Enabled some i18n of labels. | |
1359 | |
1360 * src/main/resources/messages.properties, | |
1361 src/main/resources/messages_de_DE.properties, | |
1362 src/main/resources/messages_en.properties, | |
1363 src/main/resources/messages_de.properties: Basic i18n for reference | |
1364 curves added. | |
1365 | |
1366 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
1367 | |
1368 * doc/conf/conf.xml: Registered the HistoricalDischargeCurveInfoGenerator. | |
1369 | |
1370 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveInfoGenerator.java: | |
1371 New. This info generator returns information of a | |
1372 HistoricalDischargeCurveGenerator. | |
1373 | |
1374 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Add an | |
1375 attribute "axistype" to axes nodex based on the JFreeChart Axis type. | |
1376 Number axes get a "number", date axes a "date". | |
1377 | |
1378 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined an | |
1379 abstract method getRangesForAxis(). | |
1380 | |
1381 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Awaits | |
1382 now an instance of ChartGenerator instead of XYChartGenerator. | |
1383 | |
1384 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1385 Implemented the getRangesForAxis() method (copied from XYChartGenerator). | |
1386 | |
1387 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
1388 @Override annotation to getRangesForAxis(). | |
1389 | |
1390 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1391 | |
1392 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
1393 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
1394 Cosmetics. | |
1395 | |
1396 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1397 | |
1398 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1399 Add CSV facet (not yet evaluated). | |
1400 | |
1401 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
1402 | |
1403 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
1404 New. This OutGenerator exports historical discharge curves to CSV and PDF. | |
1405 Currently, only the CSV export is implemented! | |
1406 | |
1407 * doc/conf/artifacts/winfo.xml: Registered a new Output CSV for historical | |
1408 discharge curves. | |
1409 | |
1410 * doc/conf/conf.xml: Registered the HistoricalDischargeCurveExporter. | |
1411 | |
1412 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1413 Generate new Facets for CSV and PDF output. | |
1414 | |
1415 * src/main/java/de/intevation/flys/utils/Formatter.java: Added new functions | |
1416 that return number formatters for historical discharge curves and a date | |
1417 formatter for short dates. | |
1418 | |
1419 * src/main/resources/messages.properties, | |
1420 src/main/resources/messages_de_DE.properties, | |
1421 src/main/resources/messages_en.properties, | |
1422 src/main/resources/messages_de.properties: Added strings for CSV header of | |
1423 historical discharge curve export. | |
1424 | |
1425 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1426 | |
1427 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1428 Adjusted to name change in River ('hibernate fix'). | |
1429 | |
1430 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1431 | |
1432 * doc/conf/artifacts/winfo.xml: Adapted the data type of W/Q input values | |
1433 for historical discharge curve calculation (intarray -> doublearray). | |
1434 | |
1435 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: | |
1436 Adapted the data type of W/Q input values. | |
1437 | |
1438 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1439 | |
1440 First steps to serve the data in cm if we are are gauges only. | |
1441 | |
1442 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1443 Fetch map gauge station -> gauge datum from backend for reference curve. | |
1444 | |
1445 * src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java: | |
1446 New. Linear transforms another function. | |
1447 | |
1448 * src/main/java/de/intevation/flys/artifacts/math/FilterFunction.java: | |
1449 New. Allows cascading functions. | |
1450 | |
1451 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
1452 New. Classifier what kind of axis types are needed. | |
1453 | |
1454 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
1455 Removed. Is now obsolete. | |
1456 | |
1457 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1458 Stores gauge station kms for start and end km if they are any. | |
1459 | |
1460 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1461 Should generate a WWAxisTypes classifier via side effect to the | |
1462 call context. | |
1463 | |
1464 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1465 Figure out for each start/end km if its a gauge station and store this | |
1466 information in the result WWs. | |
1467 | |
1468 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1469 Uses the WWAxisTypes classifier now to generate the right data. | |
1470 TODO: Use the blackboard object. | |
1471 | |
1472 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1473 | |
1474 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
1475 Removed superfluous imports. | |
1476 | |
1477 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1478 | |
1479 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1480 Set number of interpolation steps for relation curve to 200. | |
1481 | |
1482 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1483 Do not sort the XYSeries. | |
1484 | |
1485 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1486 | |
1487 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: | |
1488 Removed. Was stub. | |
1489 | |
1490 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1491 | |
1492 Improved Reference Curves. | |
1493 | |
1494 * doc/conf/artifacts/winfo.xml: Add start/end input step for reference | |
1495 curves. | |
1496 | |
1497 * doc/conf/themes.xml: Add theme for reference curve. | |
1498 | |
1499 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1500 Disable start/end point-hack for reference curve. Go with 'live' | |
1501 values. | |
1502 | |
1503 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1504 i18n. | |
1505 | |
1506 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
1507 New. State to enter location. | |
1508 | |
1509 * src/main/java/de/intevation/flys/artifacts/states/InputDoubleState.java: | |
1510 New. | |
1511 | |
1512 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1513 Take WW name to display in themepanel. | |
1514 | |
1515 * src/main/resources/messages.properties, | |
1516 src/main/resources/messages_de_DE.properties, | |
1517 src/main/resources/messages_en.properties, | |
1518 src/main/resources/messages_de.properties: Added translations. | |
1519 | |
1520 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1521 | |
1522 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Use | |
1523 the current date for discharge tables which doesn't have a stop time set. | |
1524 A warning message is written to log. | |
1525 | |
1526 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1527 Generate report facet before leaving the computeXXX() method when no | |
1528 calculation results has been computed. | |
1529 | |
1530 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1531 | |
1532 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
1533 that returns the name of a reference gauge (for historical discharge | |
1534 curves). | |
1535 | |
1536 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1537 Create title, subtitle and axes labels for charts of this type. | |
1538 | |
1539 * src/main/resources/messages.properties, | |
1540 src/main/resources/messages_de_DE.properties, | |
1541 src/main/resources/messages_en.properties, | |
1542 src/main/resources/messages_de.properties: Added title, subtitle and axes | |
1543 labels for historical discharge curves. | |
1544 | |
1545 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1546 | |
1547 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1548 Fix. | |
1549 | |
1550 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1551 | |
1552 * src/main/resources/messages.properties, | |
1553 src/main/resources/messages_de_DE.properties, | |
1554 src/main/resources/messages_en.properties, | |
1555 src/main/resources/messages_de.properties: Added translations for | |
1556 states (will be shown in client). | |
1557 | |
1558 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1559 | |
1560 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1561 Ja!vadoc. | |
1562 | |
1563 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1564 Declare getYAxisWalker as abstract to avoid weird issue with | |
1565 overriden methods of this name. | |
1566 | |
1567 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1568 | |
1569 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1570 Use the WW.ApplyFunctionIterator to fetch the data. | |
1571 | |
1572 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
1573 Removed superfluous imports. | |
1574 | |
1575 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1576 | |
1577 * doc/conf/artifacts/winfo.xml: Registered a ReportFacet for historical | |
1578 discharge curve report. | |
1579 | |
1580 * doc/conf/conf.xml: Registered a ReportGenerator for historical discharge | |
1581 curves. | |
1582 | |
1583 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add | |
1584 problems if we were not able to find a Q for a given W. | |
1585 | |
1586 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1587 Generate a ReportFacet if there were problems during calculcation. | |
1588 | |
1589 * src/main/resources/messages.properties, | |
1590 src/main/resources/messages_de_DE.properties, | |
1591 src/main/resources/messages_en.properties, | |
1592 src/main/resources/messages_de.properties: Added error messages for the | |
1593 case that we were not able to find a Q for a given W while calculating | |
1594 historical discharge curve data. | |
1595 | |
1596 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1597 | |
1598 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1599 Improved adding new data for historical discharge curves: skip NaN | |
1600 values; use JFreeChart's Day TimePeriod instead of Second. | |
1601 | |
1602 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1603 | |
1604 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1605 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Refactoring: | |
1606 moved addDatasets(), applyThemes() and some other methods into | |
1607 ChartGenerator; enhanced the AxisDataset interface. | |
1608 | |
1609 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1610 Implemented necessary abstract methods and improved internal AxisDataset | |
1611 class (added new methods). | |
1612 | |
1613 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1614 | |
1615 * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a | |
1616 function that expands a given range. Take care on NaN in getRanges(). | |
1617 | |
1618 * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
1619 Prevent of NullPointerExceptions in isMinimumShapeVisible() and | |
1620 isMaximumShapeVisible(). | |
1621 | |
1622 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1623 | |
1624 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1625 Create new AxisDatasets and new TimeSeriesCollections for each Facet. | |
1626 | |
1627 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1628 | |
1629 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Added a | |
1630 method getTimerange(idx) that returns the Timerange at a given index. | |
1631 | |
1632 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: | |
1633 Return the correct WQTimerange object in getData(). | |
1634 | |
1635 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1636 | |
1637 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1638 src/main/java/de/intevation/flys/exports/ChartGenerator.java: More | |
1639 refactoring: the AxisDataset is defined by an interface in ChartGenerator | |
1640 now. Each subclass of ChartGenerator should implement its own AxisDataset. | |
1641 This allows us to provide multiple XYDataset types in different charts. | |
1642 | |
1643 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1644 Implemented some necessary methods (abstract definitions of parent class) | |
1645 and create new empty timeseries charts. | |
1646 | |
1647 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1648 | |
1649 * src/main/java/de/intevation/flys/exports/ChartHelper.java: New helper | |
1650 class for working with charts. | |
1651 | |
1652 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1653 | |
1654 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1655 Removed useless import. | |
1656 | |
1657 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1658 src/main/java/de/intevation/flys/exports/ChartGenerator.java: More | |
1659 refactoring: moved more base code from XYChartGenerator to its parent | |
1660 class ChartGenerator. | |
1661 | |
1662 2012-02-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1663 | |
1664 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
1665 Refactored. Use supers static field. | |
1666 | |
1667 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
1668 Refactored. Use static field. | |
1669 | |
1670 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
1671 src/main/java/de/intevation/flys/utils/FLYSUtils.java | |
1672 (getMinMax, getRiverMinMax): Refactored. Moved to FLYSUtils. | |
1673 | |
1674 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1675 Add so-called javadoc. | |
1676 | |
1677 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1678 | |
1679 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1680 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved | |
1681 further base code from XYChartGenerator into its ChartGenerator. | |
1682 | |
1683 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1684 Override generateChart() instead of generate() which is now implemented | |
1685 in ChartGenerator. | |
1686 | |
1687 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1688 | |
1689 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1690 New. This ChartGenerator should be used for timeseries charts. Currently, | |
1691 this class is a stub only! WORK IS IN PROGRESS! | |
1692 | |
1693 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1694 Subclasses TimeseriesChartGenerator now instead of XYChartGenerator, | |
1695 because historical discharge curve charts will have a time x axis set. | |
1696 | |
1697 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1698 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved some | |
1699 basic stuff from XYChartGenerator into ChartGenerator. | |
1700 | |
1701 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1702 | |
1703 * src/main/java/de/intevation/flys/artifacts/charts/TimeseriesStepChart.java: | |
1704 Added standalone demo app for evaluating different timeseries charts. | |
1705 | |
1706 2012-02-02 Raimund Renkert <raimund.renkert@intevation.de> | |
1707 | |
1708 Issue 466: CSV export for chart themes. | |
1709 | |
1710 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1711 Export a CSV file if the requested format is 'csv'. | |
1712 | |
1713 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
1714 Generate the CSV file containing X-Y-data of all activated themes. | |
1715 | |
1716 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1717 | |
1718 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
1719 Moved code to load values of a discharge table into an own static | |
1720 function to be able to reuse it in Calculation6. | |
1721 | |
1722 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: | |
1723 Implemented the findValueForW(). | |
1724 | |
1725 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1726 | |
1727 Fake some reference curve input values to have working prototype | |
1728 to work on. | |
1729 | |
1730 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1731 Syntax-stunt fake reference inputs. | |
1732 | |
1733 * src/main/java/de/intevation/flys/artifacts/model/WW.java | |
1734 (getW1): Accessor for first w at index (for the raw ww). | |
1735 | |
1736 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java | |
1737 (doReferenceOut): Plot the raw W-over-W. | |
1738 | |
1739 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1740 | |
1741 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Create time | |
1742 millis for timerange used in Calculation6. | |
1743 | |
1744 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Added | |
1745 the first step of the calculation: fetch relevant discharge tables based | |
1746 on the given input parameters. The calculated values are not the right | |
1747 ones! Finding Ws and Qs in discharge tables is still not implemented! WORK | |
1748 IN PROGRESS! | |
1749 | |
1750 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1751 Create facets for each WQTimerange object calculated by Calculation6. | |
1752 | |
1753 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1754 | |
1755 * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: Added a | |
1756 new constructor that takes Date objects for start and end time. | |
1757 | |
1758 2012-02-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1759 | |
1760 * src/main/java/de/intevation/flys/artifacts/model/W.java: | |
1761 Forget to create ws data in constructor. | |
1762 | |
1763 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1764 | |
1765 * doc/conf/artifacts/winfo.xml: Replaced Reference Curve input state | |
1766 with LocationSelect-State for debugging purposes. Add output to | |
1767 reference.curve- state. | |
1768 | |
1769 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1770 | |
1771 * doc/conf/conf.xml: Register ReferenceCurve*Generators. | |
1772 | |
1773 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1774 | |
1775 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
1776 Cosmetics. | |
1777 | |
1778 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1779 | |
1780 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1781 Added pro forma facet. | |
1782 | |
1783 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1784 | |
1785 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1786 Added comment. | |
1787 | |
1788 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1789 | |
1790 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1791 Added reference curve facet type. | |
1792 | |
1793 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1794 | |
1795 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Fetch | |
1796 necessary parameters for 'historical discharge curve' calculation and call | |
1797 Calculation6 with those parameters. | |
1798 | |
1799 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: | |
1800 Modified default constructor and calculate() signatures and added a | |
1801 parameter check which is evaluated before the calculation starts. | |
1802 | |
1803 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1804 | |
1805 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java, | |
1806 src/main/java/de/intevation/flys/exports/ReferenceCurveInfoGenerator.java: | |
1807 Added outline of a new chart-generator. | |
1808 | |
1809 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1810 | |
1811 * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: New. | |
1812 This class might be used to store timeranges. Start and end time are | |
1813 stores as long (milliseconds since january 1, 1970). | |
1814 | |
1815 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: | |
1816 New. This class should be used to save Ws, Qs and timeranges. | |
1817 | |
1818 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1819 | |
1820 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added helper | |
1821 methods to extract int[] and double[] from string. | |
1822 | |
1823 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1824 | |
1825 * doc/conf/artifacts/winfo.xml: Registered new facet type | |
1826 'historical_discharge.historicalq' to the 'historical_discharge' output. | |
1827 | |
1828 * doc/conf/conf.xml: Registered new HistoricalDischargeCurveGenerator for | |
1829 output type 'historical_discharge'. | |
1830 | |
1831 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
1832 new facet type for HISTORICAL_DISCHARGE_Q. | |
1833 | |
1834 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1835 New. This ChartGenerator is used to generate new charts for historical | |
1836 discharge curves. WORK IN PROGRESS! | |
1837 | |
1838 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: New. | |
1839 This class should 'compute' the historical discharge curves. WORK IN | |
1840 PROGRESS! | |
1841 | |
1842 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: | |
1843 New. This Facet is used during the calculation of historical discharge | |
1844 curves. | |
1845 | |
1846 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, | |
1847 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added stubs | |
1848 to trigger the calculation of data used for generating historical | |
1849 discharge curve charts. | |
1850 | |
1851 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1852 | |
1853 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1854 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
1855 Removed needless imports. | |
1856 | |
1857 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1858 | |
1859 * src/main/resources/messages_de.properties, | |
1860 src/main/resources/messages_de_DE.properties: | |
1861 Fixed "W bei ..m" -> "W fuer ...n" . | |
1862 | |
1863 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1864 | |
1865 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1866 Avoid NPE, add warning to log to not forget about it. | |
1867 | |
1868 2012-01-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1869 | |
1870 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
1871 Fixed problems with unformatted numbers in error message. | |
1872 | |
1873 2012-01-31 Ingo Weinzierl <ingo@intevation.de> | |
1874 | |
1875 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: | |
1876 Override getLabelFor() to return the I18N string for the selected | |
1877 evaluation mode. | |
1878 | |
1879 2012-01-31 Ingo Weinzierl <ingo@intevation.de> | |
1880 | |
1881 * doc/conf/artifacts/winfo.xml: Modified types of parameters in the | |
1882 'historical discharge curves' transitions. | |
1883 | |
1884 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1885 | |
1886 * doc/conf/artifacts/winfo.xml: Fix transition type (Stupid Bug 1.0 reverse). | |
1887 | |
1888 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1889 | |
1890 * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java: | |
1891 Override getLabelFor() method defined in DefaultState to return the name | |
1892 of a Gauge based on the official number which is stored in the | |
1893 parameterization. | |
1894 | |
1895 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1896 | |
1897 Allow manual points in more diagram types. | |
1898 | |
1899 * doc/conf/artifacts/winfo.xml: Add respective facet types to | |
1900 compatibility lists of output modes. | |
1901 | |
1902 * doc/conf/artifacts/manualpoints.xml: Mention facet types. | |
1903 | |
1904 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1905 Added ChartType enum to ease later iteration. | |
1906 (IS.MANUALPOINTS): Added helper. | |
1907 | |
1908 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java: | |
1909 Help artifact figuring out which data to provide by passing facet | |
1910 name. | |
1911 | |
1912 * src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
1913 Respond to getPointData with correct data item, depending on facet | |
1914 name. | |
1915 | |
1916 * src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: | |
1917 Iterate over chart types. Add facets if corresponding data is found. | |
1918 | |
1919 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1920 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
1921 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1922 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1923 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
1924 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
1925 Handle manual point facets. | |
1926 | |
1927 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1928 | |
1929 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Clone | |
1930 StateData model objects to save parameters in this Artifact - create | |
1931 new StateData instances only if no StateData model was found for a | |
1932 parameter. This solves the problem of loosing the type of a StateData. | |
1933 | |
1934 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
1935 Implemented a getLabelFor() method that is used to format a parameter | |
1936 value. | |
1937 | |
1938 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
1939 Adapted method signature of transform(). | |
1940 | |
1941 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1942 Override getLabelFor() method to create a well formatted label for min/max | |
1943 values. | |
1944 | |
1945 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1946 | |
1947 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: | |
1948 Bugfix: use correct order of parameters in DefaultStateData constructor. | |
1949 | |
1950 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1951 | |
1952 * doc/conf/artifacts/winfo.xml: Fixed a stupid bug. Use | |
1953 ValueCompareTransition instead of DefaultTransition to evaluate values. | |
1954 | |
1955 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1956 | |
1957 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1958 Write default values for min and max items into the DESCRIBE document. | |
1959 | |
1960 2012-01-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1961 | |
1962 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1963 Added field 'startKm' and 'endKm' to make it easier to associate | |
1964 gauge to km to return Ws in cm if km is at a gauge. | |
1965 | |
1966 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1967 Construct the WWs with startKm and endKm. This is necessary because | |
1968 if an error occurs in calcuting an in between km in a list of end kms | |
1969 the index does not correspond to the input value any more. | |
1970 | |
1971 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1972 | |
1973 * doc/conf/artifacts/winfo.xml: Added transitions for "historical discharge | |
1974 curves" calculation. | |
1975 | |
1976 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1977 | |
1978 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1979 (doPoints): Skip 'inactive' points. | |
1980 | |
1981 2012-01-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1982 | |
1983 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1984 Removed the createNormalized() method because it did not | |
1985 solve all problems with the transformation of the W~W data we have. | |
1986 | |
1987 - We need to shift the values to be based in (0, 0). | |
1988 - We need to linear transform the values if they are at gauges. | |
1989 - Copying the data is memory expensive. | |
1990 | |
1991 Therefore there is now a new inner class ApplyFunctionIterator | |
1992 that is able to transform the values in an iterator like manner. | |
1993 The transform functions default to the identity. | |
1994 | |
1995 * src/main/java/de/intevation/flys/artifacts/math/Sub.java: New. | |
1996 Simple function that subtract a scalar from the parameter. | |
1997 | |
1998 * src/main/java/de/intevation/flys/artifacts/model/W.java: Added | |
1999 method minWs() to calulate the minimal W of the data. | |
2000 | |
2001 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
2002 getData() returns a WW.ApplyFunctionIterator with identity transform. | |
2003 | |
2004 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
2005 getData() returns a WW.ApplyFunctionIterator with a base shift to (0, 0). | |
2006 | |
2007 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2008 | |
2009 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
2010 Added method createNormalized() to shift the data to start in (0, 0). | |
2011 | |
2012 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
2013 Returns the 'normalized' data of the reference curve. | |
2014 | |
2015 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2016 | |
2017 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
2018 New. Facet for the normalized W~W relation. | |
2019 TODO: Implement the on-the-fly creation logic. | |
2020 | |
2021 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
2022 New. Facet for the W~W relation. | |
2023 | |
2024 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: Cosmetics. | |
2025 | |
2026 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2027 | |
2028 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
2029 Added stub loop for creating facets. | |
2030 | |
2031 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2032 Cosmetics. | |
2033 | |
2034 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2035 | |
2036 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2037 Call the 'Bezugslinienverfahren'. | |
2038 | |
2039 * src/main/resources/messages.properties, | |
2040 src/main/resources/messages_de_DE.properties, | |
2041 src/main/resources/messages_en.properties, | |
2042 src/main/resources/messages_de.properties: | |
2043 I18N for the 'Bezugslinienverfahren' error messages. | |
2044 | |
2045 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2046 | |
2047 * doc/conf/themes.xml: Better theme for manual points. | |
2048 | |
2049 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2050 Theme text part of manual points. Offset it a bit. | |
2051 | |
2052 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2053 | |
2054 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
2055 Fixed stupid bug. | |
2056 | |
2057 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
2058 | |
2059 * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java, | |
2060 src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, | |
2061 src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java, | |
2062 src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: | |
2063 New. States used in the 'historical discharge curve' calculation. | |
2064 | |
2065 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
2066 | |
2067 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: New | |
2068 state that eases adding min/max value pairs to describe document. | |
2069 | |
2070 * src/main/java/de/intevation/flys/artifacts/states/IntRangeState.java: | |
2071 New. Subclasses MinMaxState and allows adding min/max integer value pairs. | |
2072 | |
2073 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
2074 | |
2075 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Moved | |
2076 code to add items to a data node for dynamich UI into an own method. | |
2077 | |
2078 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
2079 | |
2080 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: Removed | |
2081 useless import. | |
2082 | |
2083 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
2084 | |
2085 * src/main/resources/messages.properties, | |
2086 src/main/resources/messages_de_DE.properties, | |
2087 src/main/resources/messages_en.properties, | |
2088 src/main/resources/messages_de.properties: Added strings which are used n | |
2089 the calculation "historical discharge curve". | |
2090 | |
2091 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2092 | |
2093 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
2094 New. Calcutation to be created from WINFOArtifact | |
2095 for the 'Bezugslinienverfahren'. | |
2096 | |
2097 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
2098 Added TODO about optimization of the 'Bezugslinienverfahren'. | |
2099 Added number of default samples of the W~W relation. | |
2100 | |
2101 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
2102 Added convinience constructor to store the calculation results. | |
2103 | |
2104 * ChangeLog: Removed false TODO. | |
2105 | |
2106 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
2107 | |
2108 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
2109 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
2110 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
2111 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
2112 Read jasper template file from resources to support i18n reports. | |
2113 | |
2114 * doc/conf/jasper/wdifferences.jasper, | |
2115 doc/conf/jasper/duration.jasper, | |
2116 doc/conf/jasper/computed-discharge.jasper, | |
2117 doc/conf/jasper/waterlevel.jasper: | |
2118 Updated report template. Resized left margin. | |
2119 | |
2120 * doc/conf/jasper/computed-discharge_en.jasper, | |
2121 doc/conf/jasper/duration_en.jasper, | |
2122 doc/conf/jasper/wdifferences_en.jasper, | |
2123 doc/conf/jasper/waterlevel_en.jasper: | |
2124 New. Templates for english reports. | |
2125 | |
2126 * src/main/resources/messages.properties, | |
2127 src/main/resources/messages_de_DE.properties, | |
2128 src/main/resources/messages_en.properties, | |
2129 src/main/resources/messages_de.properties: | |
2130 Added i18n strings for template files and modes. | |
2131 | |
2132 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2133 | |
2134 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
2135 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2136 Prevent second Legend Entry for points (prior was one for the | |
2137 TextAnnotations and one for the points). | |
2138 | |
2139 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2140 | |
2141 Blindly render Text of manual points if it does not collide with | |
2142 other text. | |
2143 | |
2144 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
2145 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2146 Handle TextAnnotations, create some for manual points. | |
2147 | |
2148 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2149 Added setter for TextAnnotations, documentation. | |
2150 | |
2151 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2152 | |
2153 * src/main/resources/messages.properties, | |
2154 src/main/resources/messages_de_DE.properties, | |
2155 | |
2156 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2157 | |
2158 Refactored class hierachy to integrate model for W~W: | |
2159 | |
2160 NamedObjImpl | |
2161 \-- W | |
2162 +-- WW | |
2163 \-- WQ | |
2164 +-- WQDay | |
2165 \-- WQKms | |
2166 \-- WQCKms | |
2167 | |
2168 * src/main/java/de/intevation/flys/artifacts/model/W.java: | |
2169 New. Base class | |
2170 | |
2171 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
2172 New. Model for W~W | |
2173 | |
2174 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
2175 src/main/java/de/intevation/flys/artifacts/model/WQDay.java, | |
2176 src/main/java/de/intevation/flys/artifacts/model/WQ.java, | |
2177 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
2178 Adjusted to follow the new class hierarchy. | |
2179 | |
2180 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
2181 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
2182 Removed superfluous imports. | |
2183 | |
2184 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2185 | |
2186 * src/main/resources/messages.properties, | |
2187 src/main/resources/messages_de_DE.properties, | |
2188 src/main/resources/messages_en.properties, | |
2189 src/main/resources/messages_de.properties, | |
2190 src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: | |
2191 i18n for ManualPointsFacets. | |
2192 | |
2193 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
2194 | |
2195 Issue 138: PDF output for calculations. | |
2196 | |
2197 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
2198 Create the PDF data source and generate the PDF report output. | |
2199 | |
2200 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2201 Add the PDF facet to state. Add export facets only once. | |
2202 | |
2203 * doc/conf/artifacts/winfo.xml: | |
2204 Added PDF facet to state. | |
2205 | |
2206 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
2207 Added new field type 'differences'. | |
2208 | |
2209 * doc/conf/jasper/wdifferences.jasper: | |
2210 New. Template for w-differences PDF export. | |
2211 | |
2212 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
2213 | |
2214 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
2215 New method that creates and returns the chosen differences of w-difference | |
2216 calculation as string. | |
2217 | |
2218 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
2219 | |
2220 Issue 138: PDF output for calculations. | |
2221 | |
2222 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
2223 Create the PDF data source and generate the PDF report output. | |
2224 | |
2225 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
2226 doc/conf/artifacts/winfo.xml: | |
2227 Added PDF facet to state. | |
2228 | |
2229 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
2230 Added new field type 'day'. | |
2231 | |
2232 * doc/conf/jasper/duration.jasper: | |
2233 New. Template for duration curve PDF report. | |
2234 | |
2235 2012-01-26 Raimund Renkert <raimund.renkert@intevation.de> | |
2236 | |
2237 Issue 138: PDF output for calculations. | |
2238 | |
2239 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
2240 Create the PDF datasource and generate the PDF report output. | |
2241 | |
2242 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
2243 doc/conf/artifacts/winfo.xml: | |
2244 Added PDF facet to state. | |
2245 | |
2246 * doc/conf/jasper/computed-discharge.jasper: | |
2247 New. Template for computed discharge PDF report. | |
2248 | |
2249 2012-01-26 Raimund Renkert <raimund.renkert@intevation.de> | |
2250 | |
2251 Issue 138: PDF output for calculations. | |
2252 | |
2253 * pom.xml: New Dependency to net.sf.jasperreports/jasperreports and | |
2254 org.codehaus.groovy/groovy-all. | |
2255 | |
2256 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
2257 Added methods for PDF generation. | |
2258 | |
2259 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
2260 Create the PDF data source and generate the PDF report output. | |
2261 | |
2262 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
2263 New. Data source for jasper reports containing the waterlevel calculation | |
2264 result. | |
2265 | |
2266 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2267 Added facet for PDF export to state. | |
2268 | |
2269 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2270 Added PDF facet type. | |
2271 | |
2272 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
2273 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
2274 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
2275 Added stub for inherited abstract method. | |
2276 | |
2277 * doc/conf/artifacts/winfo.xml: | |
2278 Added PDF facet to outputmode 'export'. | |
2279 | |
2280 * doc/conf/jasper, | |
2281 doc/conf/jasper/waterlevel.jasper: | |
2282 New. Folder for jasperreports templates and first template for | |
2283 waterlevel report. | |
2284 | |
2285 * src/main/resources/messages.properties, | |
2286 src/main/resources/messages_de_DE.properties, | |
2287 src/main/resources/messages_en.properties, | |
2288 src/main/resources/messages_de.properties: | |
2289 Added i18n string for calculation mode. | |
2290 | |
2291 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2292 | |
2293 Renderer 'manual' points in LongitudinalSectionGenerator. | |
2294 | |
2295 * pom.xml: New dependency to org.json/json. | |
2296 | |
2297 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2298 (doOut): Handle manual points. | |
2299 (doPoints): Add point- series. | |
2300 | |
2301 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2302 Added MANUALPOINTS Facet Type. | |
2303 | |
2304 * doc/conf/themes.xml: Added Default Theme for Manual Points. | |
2305 | |
2306 * doc/conf/artifacts/winfo.xml: Added manual point facet to | |
2307 compatibility list of longitudinal section diagram. | |
2308 | |
2309 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2310 | |
2311 Cosmetics. | |
2312 | |
2313 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, | |
2314 src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
2315 Removed obsolete imports. | |
2316 | |
2317 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2318 | |
2319 Add initial infrastructure for user-provided data ('manual points'). | |
2320 | |
2321 * doc/conf/artifacts/manualpoints.xml: Trivial state model for new | |
2322 Artifact. | |
2323 | |
2324 * doc/conf/conf.xml: Registered manualpoint artifact and factory. | |
2325 | |
2326 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, | |
2327 src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java, | |
2328 src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
2329 New. Basic infrastructure for ManualPoints. | |
2330 | |
2331 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2332 | |
2333 * doc/conf/artifacts/winfo.xml: Removed superfluous condition checks. | |
2334 | |
2335 2012-01-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2336 | |
2337 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
2338 Cosmetics, documentation. | |
2339 | |
2340 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2341 | |
2342 * doc/conf/artifacts/winfo.xml: Add states/transitions stubs for | |
2343 "Bezugsllinenverfahren." | |
2344 | |
2345 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
2346 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: | |
2347 Stubs for the two new states. | |
2348 | |
2349 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2350 | |
2351 * contrib/visualize-transitions.xsl: Fixed output of the conditions | |
2352 of the transitions. Now you can see the circumstances | |
2353 when a branch is taken. | |
2354 | |
2355 2012-01-25 Raimund Renkert <raimund.renkert@intevation.de> | |
2356 | |
2357 Issue 461. | |
2358 | |
2359 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2360 Override buildChartSection() to disable the chart subtitle entry in | |
2361 ChartSettings. | |
2362 | |
2363 2012-01-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2364 | |
2365 I18N for WINFO calculations messages. | |
2366 | |
2367 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
2368 Allow optional arguments in error messages to support meaningful | |
2369 formatting containing e.g. numbers. | |
2370 | |
2371 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
2372 Added a convenience getMsg() method. | |
2373 | |
2374 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
2375 src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, | |
2376 src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, | |
2377 src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, | |
2378 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
2379 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
2380 Adjusted the code to use the I18N symbols now. | |
2381 | |
2382 * src/main/resources/messages.properties, | |
2383 src/main/resources/messages_de_DE.properties, | |
2384 src/main/resources/messages_en.properties, | |
2385 src/main/resources/messages_de.properties: Added the I18N strings. | |
2386 | |
2387 2012-01-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2388 | |
2389 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2390 Handle the case in "W auf freier Strecke" where more than | |
2391 one Q is related to a W. TODO: Generate user report. | |
2392 | |
2393 2012-01-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2394 | |
2395 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2396 Added code for the simple case of "Bezugslinienverfahren" ("W auf freier Strecke"). | |
2397 TODO: Handle case if the model returns more than one Q for a given W. | |
2398 | |
2399 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
2400 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
2401 Micro optimizations. | |
2402 | |
2403 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2404 | |
2405 Fix flys/issue452 (Annotations at second y-axis). | |
2406 | |
2407 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2408 Added new type (duration_curve.mainvalues.q). | |
2409 | |
2410 * doc/conf/themes.xml: Added theme mapping for new facet type. | |
2411 | |
2412 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
2413 Create another Facet. | |
2414 | |
2415 * doc/conf/artifacts/winfo.xml: Added new facet type to compatibility | |
2416 list. | |
2417 | |
2418 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
2419 Handle new Facet. | |
2420 | |
2421 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
2422 Added field to be able to remember which axis to stick to. | |
2423 | |
2424 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: | |
2425 Tell Annotations to stick to Q axis in the special duration_curve | |
2426 environment. | |
2427 | |
2428 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2429 (AxisDataset): Added plotAxisIndex to now have a | |
2430 two-way-association. | |
2431 Tell own axisDatasets to which 'jfreechart'-axis they are assigned. | |
2432 Evaluate which axis the StickyAxisAnnotations should be sticked to, | |
2433 and calculate text and line positions accordingly. | |
2434 Removed junk. | |
2435 | |
2436 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2437 | |
2438 Fix compilation. | |
2439 | |
2440 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
2441 Use StickyAxisAnnotations instead of XYTextAnnotations. | |
2442 | |
2443 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2444 | |
2445 Some unification of Annotation handling. | |
2446 | |
2447 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2448 Add a third annotation type (now have text, hyk and sticky). | |
2449 | |
2450 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
2451 Use double instead of float values, removed commented code. | |
2452 | |
2453 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
2454 Reduced to keep information about placements etc only. Not a | |
2455 Annotation (in JFreeChart sense) anymore. | |
2456 | |
2457 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
2458 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, | |
2459 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
2460 Use StickyAxisAnnotations instead of XYTextAnnotations. | |
2461 | |
2462 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
2463 Added new LineStyle class. | |
2464 | |
2465 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2466 Call addAnnotationsToRenderer later, where positioning information | |
2467 is already known. | |
2468 (addAnnotationsToRenderer): Deal with the three Annotation types. | |
2469 Instead of StickyAnnotations, add | |
2470 CollisionFreeXYText- and | |
2471 XYLineAnnotations. | |
2472 (Area): Helper class. | |
2473 | |
2474 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2475 | |
2476 Some unification of Annotation handling. | |
2477 | |
2478 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
2479 | |
2480 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2481 | |
2482 Fix flys/issue395 (SVG/PDF-Export: Längsschitt enthält keine | |
2483 Streckenfavoriten.) | |
2484 | |
2485 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
2486 Fix pdf/svg rendering of annotatios, by adding a | |
2487 ChartRenderingInfo-object to the chart.draw call. | |
2488 | |
2489 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2490 | |
2491 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2492 Added new key and getter for a short subtitle. The short subtitle is | |
2493 used if no range exists. | |
2494 | |
2495 * src/main/resources/messages.properties, | |
2496 src/main/resources/messages_de_DE.properties, | |
2497 src/main/resources/messages_en.properties, | |
2498 src/main/resources/messages_de.properties: | |
2499 Added i18n string for shor subtitle. | |
2500 | |
2501 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2502 | |
2503 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2504 Removed state validation. Validation prevents drawing the diffenrences | |
2505 diagramm and all states except of WDifferencesState always return | |
2506 true. | |
2507 | |
2508 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2509 | |
2510 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
2511 New. Candidate to replace StickyAxisAnnotation eventually. | |
2512 | |
2513 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2514 | |
2515 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
2516 Added null-guards to functions parameters. | |
2517 | |
2518 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2519 | |
2520 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2521 Respect flowing direction of river when finding valid | |
2522 hykformations. | |
2523 | |
2524 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2525 | |
2526 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2527 Add an empty facet to this state if the artifact is a Chartartifact. | |
2528 | |
2529 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2530 Do not add the range to subtitle if no range exists. | |
2531 | |
2532 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2533 | |
2534 'New chart' for cross sections. | |
2535 | |
2536 * doc/conf/artifacts/chart.xml: Updated the states and transitions for | |
2537 new charts. | |
2538 | |
2539 * doc/conf/meta-data.xml: Added cross sections to datacage. | |
2540 | |
2541 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
2542 Changed cast from WINFOArtifact to FLYSArtifact. | |
2543 | |
2544 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2545 Changed artifact data strings for chart_type. | |
2546 | |
2547 * src/main/resources/messages.properties, | |
2548 src/main/resources/messages_de_DE.properties, | |
2549 src/main/resources/messages_en.properties, | |
2550 src/main/resources/messages_de.properties: | |
2551 Changed i18n string for cross sections and logitudinal sections. | |
2552 | |
2553 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2554 | |
2555 Add basic (text) styling for HYKs. | |
2556 | |
2557 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2558 Minor cleanup, pass HYK theme on. | |
2559 | |
2560 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2561 Apply TextStyle to TextAnnotation part for HYK zones. | |
2562 | |
2563 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
2564 (TextStyle): New class to bundle text-styling info. | |
2565 | |
2566 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2567 Refactored constructors to ease setting Style in the newly | |
2568 created usage scenario. | |
2569 | |
2570 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2571 | |
2572 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2573 Cleanup. Mark spot where State-based caching could happen. | |
2574 | |
2575 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2576 | |
2577 * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: | |
2578 Cosmetics. | |
2579 | |
2580 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2581 | |
2582 * doc/conf/cache.xml: Added Cache for HYKS. | |
2583 | |
2584 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2585 | |
2586 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2587 Made HYKFactory.Zone Serializable. | |
2588 | |
2589 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2590 | |
2591 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: | |
2592 Cosmetics. | |
2593 | |
2594 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2595 | |
2596 Added style definition for hyks. | |
2597 | |
2598 * doc/conf/themes.xml: Added hyk style (text). | |
2599 | |
2600 2012-01-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2601 | |
2602 * doc/conf/cache.xml: Removed cache "service-distanceinfo". | |
2603 | |
2604 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
2605 Now uses the annotations from the LocationProvider and the | |
2606 XML documents are no longer cached. | |
2607 | |
2608 2012-01-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2609 | |
2610 * doc/conf/cache.xml: Removed "annotations" cache. | |
2611 | |
2612 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
2613 Removed annotation caching. | |
2614 | |
2615 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
2616 Changed internal data structure to FastAnnotations which are also cached. | |
2617 | |
2618 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
2619 Use FastAnnotations now which are fetched via the LocationProvider. | |
2620 | |
2621 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Added | |
2622 time measurement for writing the CVS output. | |
2623 | |
2624 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2625 Removed superfluous import. | |
2626 | |
2627 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2628 | |
2629 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2630 Respect visibility flag of HYK facet. | |
2631 | |
2632 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2633 Log malcondition, make colored hyk-box a bit smaller. | |
2634 | |
2635 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2636 | |
2637 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
2638 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2639 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2640 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
2641 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, | |
2642 src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, | |
2643 src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
2644 Cosmetics, docs, improved logging. | |
2645 | |
2646 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2647 | |
2648 * doc/conf/meta-data.xml: Recommend hyks for current river if hit by | |
2649 a crosssection-out. | |
2650 | |
2651 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2652 | |
2653 Somewhat improved HYK handling and rendering. | |
2654 | |
2655 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: | |
2656 Store ids in more sensibly named data item and expose it. | |
2657 Spawn all facets in inactive state. | |
2658 | |
2659 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2660 Make HYK name accessible, do not query hyks by river, but by hyk-id, | |
2661 made query more real-world. | |
2662 | |
2663 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2664 Use hyks name as facet name, pass hyk-id when asking for hyks. | |
2665 | |
2666 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2667 | |
2668 Somewhat improved HYK handling and rendering. | |
2669 | |
2670 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2671 Added ability to store 'zones', next to text annotations. | |
2672 | |
2673 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2674 (getLowestYValue, getUppestYValue, colorForHYKZone), | |
2675 (addBoxAnnotations): New. Create box annotations from zones. | |
2676 | |
2677 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2678 (doHYK): New, handle hyk facets by adding zones to annotation | |
2679 container. | |
2680 | |
2681 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2682 | |
2683 Preparing improved HYK handling. | |
2684 | |
2685 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2686 (Zone.getTo): New accesor. | |
2687 TODOs and documentation added. | |
2688 | |
2689 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2690 | |
2691 'New Chart' for w-differences curve. | |
2692 | |
2693 * doc/conf/artifacts/chart.xml: Added empty facet to output mode. | |
2694 | |
2695 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2696 Add an empty facet if the artifact is a ChartArtifact. | |
2697 | |
2698 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2699 | |
2700 'New Chart' for discharge longitudinal section curve. | |
2701 | |
2702 * doc/conf/artifacts/chart.xml: Added transition for location input. | |
2703 | |
2704 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
2705 Changed cast from WINFOArtifact to FLYSArtifact. | |
2706 | |
2707 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
2708 Add an empty facet if the artifact is a ChartArtifact. | |
2709 | |
2710 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2711 | |
2712 'New Chart' for duration curve. | |
2713 | |
2714 * doc/conf/artifacts/chart.xml: Added state and transition for location input. | |
2715 | |
2716 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
2717 Changed cast from WINFOArtifact to FLYSArtifact. | |
2718 | |
2719 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: | |
2720 Add an empty facet if the artifact is a ChartArtifact. | |
2721 | |
2722 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2723 | |
2724 Added accidentally ommitted HYKFacet, fixing build. | |
2725 | |
2726 * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: | |
2727 New, stubby facet for hyk infrastructure. | |
2728 | |
2729 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2730 | |
2731 'New Chart' for computed discharge curve. | |
2732 | |
2733 * doc/conf/artifacts/chart.xml: Fixed transitions and added state for km input. | |
2734 | |
2735 * src/main/java/de/intevation/flys/artifacts/model/EmptyFacet.java: | |
2736 New. Added an empty facet to avoid deleting an empty output. | |
2737 | |
2738 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, | |
2739 src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
2740 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
2741 Changed some return values if the artifact is a ChartArtifact. | |
2742 | |
2743 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
2744 src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
2745 Changed casts from WINFOArtifact to FLYSArtifact. | |
2746 | |
2747 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
2748 Add an empty facet if the artifact is a ChartArtifact. | |
2749 | |
2750 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2751 Set a default axis range if the range is null. | |
2752 | |
2753 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2754 | |
2755 Added stub hyk infrastructure. | |
2756 | |
2757 * doc/conf/artifacts/hyk.xml: Added trivial transition configuration | |
2758 for hyk artifacts. | |
2759 | |
2760 * doc/conf/conf.xml: Register HYK artifact and its transition conf. | |
2761 | |
2762 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, | |
2763 src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java, | |
2764 src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2765 Added static 'hyk' artifact, facet and state. | |
2766 | |
2767 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2768 | |
2769 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2770 Add 'hyk' facet type. | |
2771 | |
2772 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2773 | |
2774 Add hyk facet to compatibility list of winfo.xml . | |
2775 | |
2776 * doc/conf/artifacts/winfo.xml: Add hyk facets to compatibility list. | |
2777 | |
2778 2012-01-18 Ingo Weinzierl <ingo@intevation.de> | |
2779 | |
2780 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
2781 method getDataAsLong that returns a Long representation of a data item or | |
2782 null if no such data item is existing or it cannot be parsed as Long. | |
2783 | |
2784 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
2785 that returns the selected reference gauge (specified by 'reference_gauge' | |
2786 parameter) of a FLYSArtifact. | |
2787 | |
2788 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2789 | |
2790 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
2791 Cache a TreeMap<km, annotation string> of the annotation values of whole | |
2792 rivers. This is _much_ more efficient than firing an HQL/SQL statement for | |
2793 each km and caching these results. | |
2794 | |
2795 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2796 | |
2797 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2798 Deleted. It is in the backend now. | |
2799 | |
2800 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
2801 src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java, | |
2802 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2803 src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java, | |
2804 src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, | |
2805 src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, | |
2806 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2807 Adjusted to use the fast cross section line from backend now. | |
2808 | |
2809 * doc/conf/cache.xml: Store cross section lines cache on disk. | |
2810 | |
2811 * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java, | |
2812 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2813 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: Removed | |
2814 superfluous imports. | |
2815 | |
2816 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2817 | |
2818 Fix assignment of stateId/hash in WaterlevelFacet. | |
2819 | |
2820 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
2821 More verbose logging, fix hash/stateid assignment. | |
2822 | |
2823 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
2824 (deepCopy): implemented. | |
2825 | |
2826 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2827 | |
2828 "Ported" StaticWQKmsArtifact to use compute-type caching mechanism. | |
2829 | |
2830 * doc/conf/artifacts/staticwqkms.xml: Declare trivial info. | |
2831 | |
2832 * doc/conf/conf.xml: Register staticwqkms artifact and factory. | |
2833 | |
2834 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: | |
2835 Sublacss DataFacet. | |
2836 | |
2837 * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java: | |
2838 New. State. | |
2839 | |
2840 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
2841 Refactored. Most computation and stuff now done in State and Facet. | |
2842 | |
2843 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2844 | |
2845 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2846 Minor cosmetics. | |
2847 | |
2848 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2849 | |
2850 Refactoring. | |
2851 | |
2852 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
2853 Added new constructor. | |
2854 | |
2855 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
2856 Refactored, subclass BlackboardDataFacet. | |
2857 | |
2858 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
2859 Refactored, subclass DataFacet. | |
2860 | |
2861 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
2862 Adjusted. | |
2863 | |
2864 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2865 | |
2866 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
2867 Cosmetics, added new constructor. | |
2868 | |
2869 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2870 | |
2871 Use improved caching for cross section data. | |
2872 !!! This commit needs heavy testing !!! | |
2873 | |
2874 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
2875 Refactored to provide the map to determine the nearest cross section line | |
2876 neighbors for a given km to the public. This is a bit hackish because | |
2877 it hhould have its own factory which is then used by this service and | |
2878 other parts of the code. | |
2879 | |
2880 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
2881 searchCrossSectionLine() now returns a FastCrossSectionLine. To find this | |
2882 line efficiently it uses the map of the CrossSectionKMService which | |
2883 already provides a nearest neighbor searching mechanism for cross | |
2884 section lines. The FastCrossSectionLine is fetched with the | |
2885 FastCrossSectionLineFactory which uses a cache as described in the | |
2886 previous commit. | |
2887 | |
2888 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
2889 src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, | |
2890 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2891 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
2892 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Uses | |
2893 the FastCrossSectionLine instead of CrossSectionLines now. | |
2894 | |
2895 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2896 Added method fetchCrossSectionProfile() to access the point data in | |
2897 the profile generating compatible way. | |
2898 | |
2899 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: Removed | |
2900 superfluous import. | |
2901 | |
2902 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2903 | |
2904 * doc/conf/cache.xml: Added cache for fast section lines chunks. | |
2905 | |
2906 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java: | |
2907 New. Chunks of FastCrossSectionLines. Stores cross section lines for ranges | |
2908 of one KM. | |
2909 | |
2910 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java: | |
2911 New. Access fast cross section lines. It uses the cache 'fast-cross-section-lines' | |
2912 configured in cache.xml to store chunks of cross section lines. | |
2913 | |
2914 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2915 New. Stores the important data (points) of a cross section line. | |
2916 | |
2917 2012-01-16 Ingo Weinzierl <ingo@intevation.de> | |
2918 | |
2919 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
2920 Added a new calculation option for historical discharge curves. | |
2921 | |
2922 * src/main/resources/messages.properties, | |
2923 src/main/resources/messages_de_DE.properties, | |
2924 src/main/resources/messages_en.properties, | |
2925 src/main/resources/messages_de.properties: Added translations for | |
2926 historical discharge curves. | |
2927 | |
2928 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2929 | |
2930 * doc/conf/artifacts/winfo.xml: Added certain facets to to | |
2931 compatibility matrices. | |
2932 | |
2933 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2934 | |
2935 * doc/conf/artifacts/annotation.xml: Fixed accidental change. | |
2936 | |
2937 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2938 | |
2939 * doc/conf/artifacts/annotation.xml: Cosmetics. | |
2940 | |
2941 2012-01-16 Ingo Weinzierl <ingo@intevation.de> | |
2942 | |
2943 * doc/conf/meta-data.xml: Enabled old floodmap calculations for output | |
2944 type 'map'. | |
2945 | |
2946 2012-01-13 Raimund Renkert <raimund.renkert@intevation.de> | |
2947 | |
2948 Initial implementation for module 'new chart'. | |
2949 | |
2950 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2951 New. Artifact for module 'new chart'. | |
2952 | |
2953 * doc/conf/artifacts/chart.xml: | |
2954 New. Artifact description for the new artifact. | |
2955 | |
2956 * doc/conf/conf.xml: | |
2957 Added new artifact to config. | |
2958 | |
2959 * src/main/resources/messages.properties, | |
2960 src/main/resources/messages_de_DE.properties, | |
2961 src/main/resources/messages_en.properties, | |
2962 src/main/resources/messages_de.properties: | |
2963 Added i18n strings for 'new chart' chart types. | |
2964 | |
2965 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2966 | |
2967 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
2968 Cosmetics. | |
2969 | |
2970 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2971 | |
2972 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
2973 Avoid NPE when copying data from one artifact to another. | |
2974 | |
2975 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2976 | |
2977 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2978 (expandRange): Prevent collapse due to negative values. | |
2979 | |
2980 2012-01-12 Raimund Renkert <raimund.renkert@intevation.de> | |
2981 | |
2982 * doc/conf/artifacts/map.xml, | |
2983 doc/conf/conf.xml, | |
2984 src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
2985 Changed the MapArtifact name to 'new_map'. | |
2986 | |
2987 2011-01-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2988 | |
2989 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
2990 Added code to calculate the area of the generated polygons. | |
2991 TODO: Render the generated area sum to the plot. | |
2992 | |
2993 2011-01-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2994 | |
2995 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
2996 Replaced System.err.println()s with proper logging. | |
2997 | |
2998 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
2999 src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java, | |
3000 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
3001 superfluous imports. | |
3002 | |
3003 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3004 | |
3005 flys/issue450 (i18n: Datenkorb: longitudinal-section) | |
3006 | |
3007 * doc/conf/meta-data.xml: Replaced dash by underscore in | |
3008 longitudinal-section. | |
3009 | |
3010 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3011 | |
3012 Towards areas on other than the first axes. | |
3013 | |
3014 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
3015 Changed signature on which to provide data via the blackboard. | |
3016 Include facets name to allow unique identification. | |
3017 | |
3018 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3019 Store name of one of the facets involved in area creation. | |
3020 (AreaFacet.Data): New class to hold result data. | |
3021 | |
3022 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3023 New methods to find out whether we have a general Q or W type of | |
3024 facet. | |
3025 | |
3026 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3027 (doArea): Use new Result-Data object instead of Object[], resolve | |
3028 which axis to put area to. | |
3029 (axisIdxForFacet): New. | |
3030 | |
3031 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3032 Subclass LongitudinalSectionGenerator. | |
3033 | |
3034 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3035 | |
3036 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
3037 Do not intefere with CrossSections. | |
3038 | |
3039 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3040 | |
3041 Cosmetics, cleanups. | |
3042 | |
3043 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
3044 (getCrossSections, getCrossSectionNames): Removed. | |
3045 | |
3046 2011-01-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3047 | |
3048 flys/issue439 (Streckenfavoriten lassen sich nicht über den Datenkorb | |
3049 hinzuladen) | |
3050 | |
3051 * doc/conf/meta-data.xml: Made Annotations available via datacage | |
3052 in longitudinal section, cosmetics. | |
3053 | |
3054 2012-01-11 Raimund Renkert <raimund.renkert@intevation.de> | |
3055 | |
3056 * doc/conf/conf.xml: | |
3057 Added output generator for output type 'map'. | |
3058 | |
3059 * doc/conf/artifacts/map.xml: | |
3060 Changed output name to 'map'. | |
3061 | |
3062 * doc/conf/meta-data.xml: | |
3063 Added new output type 'map'. | |
3064 | |
3065 2011-01-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3066 | |
3067 Fix flys/issue446 (Dauerline/Abflusskurve am Pegel: Eigenschaften vom | |
3068 Hauptwertthema nicht aufrufbar) | |
3069 | |
3070 * doc/conf/themes.xml: Add default styles for mainvalues.q/w and other | |
3071 themes. | |
3072 | |
3073 2012-01-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3074 | |
3075 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
3076 Removed XPath injection security hole. A serious one because it allowed | |
3077 inspecting the conf.xml file ... with all the db passwords. | |
3078 | |
3079 2012-01-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3080 | |
3081 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, | |
3082 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3083 Removed superfluous imports. | |
3084 | |
3085 2012-01-11 Ingo Weinzierl <ingo@intevation.de> | |
3086 | |
3087 * doc/conf/meta-data.xml: Added the definition of old calculation results | |
3088 for floodmaps. | |
3089 | |
3090 2012-01-10 Ingo Weinzierl <ingo@intevation.de> | |
3091 | |
3092 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Added | |
3093 methods getLayers() and removeLayer(). | |
3094 | |
3095 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
3096 method getFacets() which returns a list of Facets supported by this | |
3097 Artifact. In addition, the FLYSArtifact is now more verbose while | |
3098 filtering Facets for Outputs. | |
3099 | |
3100 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3101 Implemented initialize() which now copies the shapefile directory of the | |
3102 model Artifact and modifies its Facets (adapts the shapepath which is the | |
3103 uuid of the Artifact). | |
3104 | |
3105 2012-01-10 Ingo Weinzierl <ingo@intevation.de> | |
3106 | |
3107 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
3108 src/main/java/de/intevation/flys/collections/OutputParser.java: Made | |
3109 them more verbose for better debugging. | |
3110 | |
3111 2012-01-09 Ingo Weinzierl <ingo@intevation.de> | |
3112 | |
3113 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3114 Initialize() now also calls State.initialize() for each State. | |
3115 | |
3116 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3117 Override initialize() which is defined in AbstractState. NOTE: Currently, | |
3118 this method has no code. | |
3119 | |
3120 2012-01-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3121 | |
3122 * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: | |
3123 New. The service to invalidate the caches. (Argh! Forgot to 'svn add') | |
3124 | |
3125 2012-01-06 Ingo Weinzierl <ingo@intevation.de> | |
3126 | |
3127 flys/issue298 (Karte: Automatischer Zoom auf Berechnungsergebnisse) | |
3128 | |
3129 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Added a | |
3130 debug statement that prints out the WSPLGEN extent. | |
3131 | |
3132 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create new | |
3133 Envelope instances for initial and max extent if they are not existing. | |
3134 Some debug statements have now been removed. | |
3135 | |
3136 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3137 | |
3138 Add cache for 'static' wqkms (e.g. BaseData) to default cache conf. | |
3139 | |
3140 * doc/conf/cache.xml: Add Cache Config for static wqkms. | |
3141 | |
3142 * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: | |
3143 Adjust typo in cache name, minor cosmetic. | |
3144 | |
3145 2011-01-06 Raimund Renkert <raimund.renkert@intevation.de> | |
3146 | |
3147 * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
3148 The map artifact has two states now and overrides describe() to | |
3149 generate UI sections in the describe response. | |
3150 The map state overrides computeAdvance() instead of computeFeed(). | |
3151 | |
3152 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
3153 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: | |
3154 Changed the WMSDBArtifact in WMSDBState to FLYSArtifact and adjusted | |
3155 constructors in state classes. | |
3156 | |
3157 * doc/conf/artifacts/map.xml: | |
3158 Added initial state and transition. | |
3159 | |
3160 * src/main/resources/messages.properties, | |
3161 src/main/resources/messages_de_DE.properties, | |
3162 src/main/resources/messages_en.properties, | |
3163 src/main/resources/messages_de.properties: | |
3164 Added i18n strings for new state. | |
3165 | |
3166 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3167 | |
3168 Partial fix for flys/issue437 (Querprofil: Zugeladene Basisdaten | |
3169 ignorieren W/Q-heit, falsche Namen). | |
3170 | |
3171 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
3172 Set name also for first column (zero based). | |
3173 | |
3174 2012-01-06 Ingo Weinzierl <ingo@intevation.de> | |
3175 | |
3176 flys/issue196 (i18n/l10n: Zahlenformate einheitlich) | |
3177 | |
3178 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: New method | |
3179 getRawValue() that extracts the raw double value from 'name' parameter. | |
3180 | |
3181 * src/main/java/de/intevation/flys/utils/Formatter.java: New method | |
3182 getRawFormatter() that returns a NumberFormat instance for the current | |
3183 locale. | |
3184 | |
3185 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
3186 Localized the W/Q labels in CSV exports. | |
3187 | |
3188 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3189 | |
3190 flys/issue442 (i18n: Datenkorb: flood-protections) | |
3191 | |
3192 * doc/conf/meta-data.xml: Replaced dash in flood-protection by | |
3193 underscore to allow translation. | |
3194 | |
3195 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3196 | |
3197 flys/issue438 (i18n: Datenkorb: additionals) | |
3198 | |
3199 * doc/conf/meta-data.xml: Fix typo. | |
3200 | |
3201 2011-01-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3202 | |
3203 * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: | |
3204 New. Uses the CacheFactory to invalidate caches by their names. | |
3205 This can be used by external ETL processes like the AFT/DIPS importer | |
3206 to prevent cache inconsistencies. | |
3207 | |
3208 Input documents look like this: | |
3209 | |
3210 <caches> | |
3211 <cache name="my-cache"/> | |
3212 ... | |
3213 <cache name="your-cache"/> | |
3214 </caches> | |
3215 | |
3216 Output documents look like this: | |
3217 | |
3218 <caches> | |
3219 <cache name="my-cache">All elements removed.</cache> | |
3220 ... | |
3221 <cache name="your-cache">Error: Cache not found.</cache> | |
3222 </caches> | |
3223 | |
3224 * doc/conf/conf.xml: Added the cache invalidation service. | |
3225 | |
3226 * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: | |
3227 Added Override annotation. | |
3228 | |
3229 2011-01-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3230 | |
3231 flys/issue432 (Diagrammeigenschaften/Flächenrenderer: | |
3232 Legenden-schriftgröße für Flächenthemen wird ignoriert) | |
3233 | |
3234 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3235 Respect legend item size when generating legend items for | |
3236 area dataseries. | |
3237 | |
3238 2011-12-09 Raimund Renkert <raimund.renkert@intevation.de> | |
3239 | |
3240 Implemented new module "new map". | |
3241 | |
3242 * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
3243 New. Artifact for the new module, extends RiverAxisArtifact and | |
3244 contains the MapState class. | |
3245 | |
3246 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
3247 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: | |
3248 Added empty constructor to embedded state classes to allow instantiation | |
3249 of MapState that extends the RiverAxisState. | |
3250 | |
3251 * src/main/java/de/intevation/flys/exports/MapGenerator.java: | |
3252 Do not generate an initialExtent element if the initial extent is | |
3253 empty. | |
3254 | |
3255 * doc/conf/artifacts/map.xml: | |
3256 New. Describes the state for the new module. | |
3257 | |
3258 * doc/conf/conf.xml: | |
3259 Added new config file. | |
3260 | |
3261 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
3262 | |
3263 flys/issue444 (error_no_export_found bei "W bei ungleichwertigem Abfluss") | |
3264 | |
3265 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: If no boolean | |
3266 value "wq_free" exists in getWQMode(), false is the default. | |
3267 | |
3268 2011-01-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3269 | |
3270 flys/issue443 (Querprofile: Hibernate LazyInitializationException) | |
3271 | |
3272 * doc/conf/cache.xml: Disable cache for cross-sections. | |
3273 | |
3274 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
3275 | |
3276 flys/issue447 (W-Differenzen: Fehler beim Hinzufügen einer Parameterisierung) | |
3277 | |
3278 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
3279 Added a new method cleanEmptyOutputs() which removes Outputs that have | |
3280 no Facets set. | |
3281 | |
3282 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Call | |
3283 CollectionAttribute.cleanEmptyOutputs() at the end of write() to remove | |
3284 empty Outputs that have been added during the merge process. | |
3285 | |
3286 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
3287 | |
3288 flys/issue440 (Karte: WSPLGEN Berechnungen für Mosel schlagen fehl) | |
3289 | |
3290 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Modified the | |
3291 getRiverBoundary() method because the signature of | |
3292 RiverAxis.getRiverAxis() has changed. This method will now take each | |
3293 geometry into account, that is retrieved by | |
3294 RiverAxis.getRiverBoundary(). | |
3295 | |
3296 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
3297 Use GeometryUtils.getRiverBoundary() to determine the boundary of a | |
3298 river. | |
3299 | |
3300 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3301 Create the riveraxis shapefile with all geometries returned by | |
3302 RiverAxis.getRiverAxis(). | |
3303 | |
3304 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
3305 | |
3306 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Repaired | |
3307 broken items in legend. The new renderer requires the current plot. This | |
3308 is set now. | |
3309 | |
3310 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
3311 | |
3312 * doc/conf/themes.xml: Added a new field 'pointsize' to the virtual theme | |
3313 'HiddenColorLines'. | |
3314 | |
3315 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to | |
3316 parse the new field of 'HiddenColorLines'. | |
3317 | |
3318 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Apply the | |
3319 pointsize defined in themes. | |
3320 | |
3321 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
3322 | |
3323 * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
3324 Use correct keys for buffering in getMinimum() and getMaximum(). | |
3325 | |
3326 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
3327 | |
3328 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java, | |
3329 src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
3330 src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
3331 Moved to de.intevation.flys.jfree. | |
3332 | |
3333 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java, | |
3334 src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, | |
3335 src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
3336 Moved from de.intevation.flys.exports. | |
3337 | |
3338 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3339 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3340 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3341 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3342 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
3343 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
3344 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3345 Added necessary imports. | |
3346 | |
3347 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
3348 | |
3349 * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
3350 Buffered the computation results of getMinimum() and getMaximum(). | |
3351 | |
3352 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
3353 | |
3354 flys/issue393 (Themenstileditor: Minimum anzeigen / Beschriftung anzeigen) | |
3355 | |
3356 * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
3357 New renderer that overrides JFreeChart's XYLineAndShapeRenderer. This | |
3358 renderer brings the option to explicitly display the minimum and/or | |
3359 maximum or a series as shape. Currently, there are no options to adjust | |
3360 the style of those shapes. | |
3361 | |
3362 * doc/conf/themes.xml: Added a new virtual theme 'MinMaxPoints'. All line | |
3363 theme inherit from that theme now. | |
3364 | |
3365 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to | |
3366 parse the fields 'showminimum' and 'showmaximum' of 'MinMaxPoints' theme. | |
3367 | |
3368 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added | |
3369 methods to apply the fields of the new Theme 'MinMaxPoints'. | |
3370 | |
3371 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Modified | |
3372 the getRenderer() method which now always returns a new instance of | |
3373 EnhancedLineAndShapeRenderer. | |
3374 | |
3375 2011-01-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3376 | |
3377 Allow styling of outline of areas. | |
3378 | |
3379 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
3380 Allow styling of outline of areas. | |
3381 | |
3382 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
3383 Parse outline style for areas, apply it to renderer. | |
3384 | |
3385 2012-01-03 Ingo Weinzierl <ingo@intevation.de> | |
3386 | |
3387 flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) | |
3388 | |
3389 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Call | |
3390 the new flys-backend method Wst.determineMinMaxQFree() to determine the | |
3391 min/max Qs at a given kilometer. | |
3392 | |
3393 2011-01-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3394 | |
3395 * doc/conf/themes.xml: Reflect name chnage of longitudinal sections | |
3396 area artifacts and include ColorLine style for area styles. | |
3397 | |
3398 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3399 | |
3400 flys/issue370 (WINFO: Berechnungsausgabe W/Pegel [cm] fehlt bei Wasserspiegellage und W am Pegel) | |
3401 | |
3402 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New method that | |
3403 extracts the double value of a WQ object's name. | |
3404 | |
3405 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Adapted | |
3406 the header of CSV exports and the content of the "W at gauge" column. | |
3407 | |
3408 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
3409 Adapted method signatures that have been changed in WaterlevelExporter. | |
3410 | |
3411 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3412 | |
3413 * src/main/resources/messages.properties, | |
3414 src/main/resources/messages_de_DE.properties, | |
3415 src/main/resources/messages_en.properties, | |
3416 src/main/resources/messages_de.properties: Added strings used in the CSV | |
3417 export. | |
3418 | |
3419 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3420 | |
3421 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Check | |
3422 if the location of a CSV row is in range of the reference gauge. Write | |
3423 "outside reference gauge" into CSV in such cases. | |
3424 | |
3425 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3426 | |
3427 PART II of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) | |
3428 | |
3429 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Add the | |
3430 named main value of a Q and the name of the gauge used for the calculation | |
3431 if the WQ mode is "W at gauge" or "Q at gauge". | |
3432 | |
3433 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
3434 Adapted the method signatures that have been modified in | |
3435 WaterlevelExporter. | |
3436 | |
3437 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3438 | |
3439 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
3440 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3441 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3442 src/main/java/de/intevation/flys/exports/AxisSection.java, | |
3443 src/main/java/de/intevation/flys/exports/ExportSection.java, | |
3444 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3445 src/main/java/de/intevation/flys/exports/ChartSection.java: Removed | |
3446 unused imports. | |
3447 | |
3448 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3449 | |
3450 PART I of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) | |
3451 | |
3452 * doc/conf/cache.xml: Registered a new Cache for the LocationProvider. | |
3453 | |
3454 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
3455 New. This class is able to return the description of a location based on a | |
3456 river and kilometer parameter. The LocationProvider stores single | |
3457 locations into a Cache if one is configured for this class. | |
3458 | |
3459 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
3460 Added a method that returns a single Annotation for a specific kilometer and | |
3461 river. | |
3462 | |
3463 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
3464 getLocationDescription() that might be used to determine the description | |
3465 of a specified kilometer for a given river. | |
3466 | |
3467 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Make use | |
3468 of FLYSUtils.getLocationDescription() to add a new column that contains | |
3469 the location description. | |
3470 | |
3471 2011-12-29 Ingo Weinzierl <ingo@intevation.de> | |
3472 | |
3473 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Write | |
3474 min/max values for free Qs into Artifact's DESCRIBE document. | |
3475 | |
3476 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3477 | |
3478 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fixed | |
3479 broken order to determine the step width of Qs and Ws. | |
3480 | |
3481 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3482 | |
3483 flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) | |
3484 | |
3485 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3486 Validate user defined free Q values. | |
3487 | |
3488 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3489 | |
3490 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3491 Compute better step width based on a maximal number of steps = 30. | |
3492 Results with digits are rounded up. E.g.: | |
3493 Q range = 9.6 - 1750 | |
3494 Step width = 58.01 | |
3495 Rounded result = 60 | |
3496 | |
3497 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3498 | |
3499 * src/main/java/de/intevation/flys/exports/AxisSection.java, | |
3500 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3501 src/main/java/de/intevation/flys/exports/ChartSection.java: Subclasses | |
3502 TypeSection to be able to use convinience methods for string, integer, | |
3503 double and boolean values. | |
3504 | |
3505 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3506 | |
3507 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: The | |
3508 getSize() method now returns null if no width and height is specified in | |
3509 the request document or if width/height <= 0. It no longer returns the | |
3510 result of getDefaultSize(). | |
3511 | |
3512 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Set the | |
3513 size of a chart export to the size specified in the ChartSettings if | |
3514 there are no valid values in the request document. | |
3515 | |
3516 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Set the | |
3517 chart size to ChartGenerator.getDefaultSize() if no valid values are | |
3518 returned by ChartGenerator.getSize(). This has been done autoamtically | |
3519 before. | |
3520 | |
3521 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3522 | |
3523 * src/main/java/de/intevation/flys/exports/TypeSection.java: New. This | |
3524 Section defines some convinience methods to add/set string, integer, | |
3525 double and boolean values. | |
3526 | |
3527 * src/main/java/de/intevation/flys/exports/ExportSection.java: New. | |
3528 Subclasses TypeSection. The ExportSection currently offers attributes | |
3529 'width' and 'height'. | |
3530 | |
3531 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added | |
3532 getter/setter methods to support an ExportSection. | |
3533 | |
3534 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create an | |
3535 ExportSection while initial ChartSettings creation. | |
3536 | |
3537 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3538 | |
3539 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added and | |
3540 make use of a new method createLegendLabelFont() to create unified Fonts for | |
3541 LegendItems. This method considers the user defined size for LegendItems. | |
3542 | |
3543 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3544 | |
3545 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3546 Implemented adjustAxes(). This method now sets the label Font of the X | |
3547 axis. Its size is determined by getXAxisLabelFontSize(). | |
3548 | |
3549 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3550 | |
3551 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added method | |
3552 getFontSize() to retrieve the font size for an axis. | |
3553 | |
3554 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3555 Modified createYAxis(int): call super.createYAxis(int) and adjust | |
3556 necessary settings - no Axis creation takes place here. | |
3557 | |
3558 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
3559 getXAxisLabelFontSize() and getYAxisLabelFontSize(int) to retrieve the | |
3560 user defined font size for an axis. The getYAxisLabelFontSize() is used in | |
3561 createYAxis(int) to set the font size for axes labels. | |
3562 | |
3563 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3564 | |
3565 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3566 Override getYAxisWalker(). | |
3567 | |
3568 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create new | |
3569 instances of IdentifiableNumberAxis in createYAxis(int) default | |
3570 implementation. | |
3571 | |
3572 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3573 | |
3574 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added | |
3575 getLabel() to retrieve the axis label. | |
3576 | |
3577 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3578 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3579 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3580 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3581 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3582 Override getDefaultXAxisLabel() and getDefaultYAxisLabel() defined in | |
3583 XYChartGenerator. | |
3584 | |
3585 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implement | |
3586 getXAxisLabel() and getYAxisLabel(int). Both methods search for an axis | |
3587 label defined in the ChartSettings first. If no label is specified or if | |
3588 no ChartSettings is set, getDefaultXAxisLabel() or | |
3589 getDefaultYAxisLabel(int) is called to retrieve the initial/default axis | |
3590 label. | |
3591 | |
3592 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3593 | |
3594 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Modified the | |
3595 signature of addAxisSection(). This method now accepts AxisSections only. | |
3596 In addition, there is a new method getAxisSection(String) that returns an | |
3597 AxisSection specified by its identifier. | |
3598 | |
3599 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added new | |
3600 methods getIdentifier(), isFixed(), getUpperRange() and getLowerRange() to | |
3601 retrieve the attributes supported by this Section. | |
3602 | |
3603 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use | |
3604 of axes ranges specified in ChartSettings if an axis is fixed. | |
3605 | |
3606 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3607 | |
3608 * src/main/java/de/intevation/flys/exports/IdentifiableNumberAxis.java: New. | |
3609 Subclasses JFreeChart's NumberAxis and offers a getId() method which | |
3610 returns an identifiable key. | |
3611 | |
3612 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implements | |
3613 a createNumberAxis() method that should be used by all subclasses to | |
3614 create new axes. This method returns an instance of IdentifiableNumberAxis | |
3615 which is required for zooming. | |
3616 | |
3617 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3618 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3619 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3620 Create new NumberAxis instances by using XYChartGenerator.createNumberAxis(). | |
3621 | |
3622 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3623 | |
3624 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3625 Implemented the methods getChartTitle() and getChartSubtitle(). Both | |
3626 methods try to get the required information from ChartSettings. If no | |
3627 ChartSettings is set for this OutGenerator, these methods will call | |
3628 getDefaultChartTitle() and getDefaultChartSubtitle(). | |
3629 | |
3630 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3631 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3632 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3633 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3634 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
3635 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
3636 Renamed getChartTitle() and getChartSubtitle() to | |
3637 getDefaultChartTitle() and getDefaultChartSubtitle(). In addition, the | |
3638 methods addSubtitles() became more robust - these OutGenerators add | |
3639 subtitles only if the subtitle is not empty. | |
3640 | |
3641 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3642 | |
3643 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a | |
3644 setSettings(Settings) method. | |
3645 | |
3646 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3647 Call OutGenerator.setSettings() before calling doOut() for each Facet. | |
3648 | |
3649 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Implemented | |
3650 setSettings() and added convinience methods to access chart specific | |
3651 settings. | |
3652 | |
3653 * src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
3654 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
3655 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
3656 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
3657 src/main/java/de/intevation/flys/exports/ReportGenerator.java: Implemented | |
3658 setSettings(). | |
3659 | |
3660 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3661 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use | |
3662 of the attributes specified in the Settings: the title, subtitle, | |
3663 displayGrid and displayLegend settings are functional now. | |
3664 | |
3665 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3666 | |
3667 * src/main/java/de/intevation/flys/exports/ChartSettings.java, | |
3668 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3669 src/main/java/de/intevation/flys/exports/ChartSection.java: Use more | |
3670 concrete classes than Settings and Section in these classes to avoid a lot | |
3671 of castings. | |
3672 | |
3673 2011-12-22 Ingo Weinzierl <ingo@intevation.de> | |
3674 | |
3675 flys/issue242 (W-INFO: Fehlende Header in Datenexporten) | |
3676 | |
3677 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added functions | |
3678 getQs(), getWs(), getGauge(), getGaugename() and getRivername() that all | |
3679 take a parameter FLYSArtifact. | |
3680 | |
3681 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Moved the | |
3682 implementation of getGauge() to FLYSUtils. The getGauge() in this class | |
3683 just calls and returns FLYSUtils.getGauge(). | |
3684 | |
3685 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Write a | |
3686 header into a CSV export containing meta information about this export. | |
3687 | |
3688 * src/main/resources/messages.properties, | |
3689 src/main/resources/messages_de_DE.properties, | |
3690 src/main/resources/messages_en.properties, | |
3691 src/main/resources/messages_de.properties: Added strings used in the CSV | |
3692 export as header. | |
3693 | |
3694 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3695 | |
3696 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3697 (getKm): Removed, not called anymore. | |
3698 | |
3699 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3700 | |
3701 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3702 Include km of cross-section-master in diagrams subtitle (fetched | |
3703 from 'blackboard'. | |
3704 | |
3705 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3706 | |
3707 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
3708 Cosmetics, docs. | |
3709 | |
3710 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3711 | |
3712 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java | |
3713 (getInitialFacetActivity): Only newest CrossSection is initially | |
3714 active. | |
3715 | |
3716 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3717 | |
3718 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java | |
3719 (isNewest): New, query whether a CrossSection is the newest for its | |
3720 river, doc. | |
3721 | |
3722 2011-12-21 Ingo Weinzierl <ingo@intevation.de> | |
3723 | |
3724 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
3725 convinience method to retrieve the value of an data object stored at | |
3726 FLYSArtifact as Boolean value. | |
3727 | |
3728 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method that | |
3729 returns the named value of a given double value. This method returns only | |
3730 the named value, if the WQ mode is "Q at gauge" and if the value fits to a | |
3731 named value. In addition to this method, there is a new method to retrieve | |
3732 the selected WQ mode as 'WQ_MODE' enum. | |
3733 | |
3734 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
3735 Removed prepareData() and its call. The data preparation had a bad side | |
3736 effect: the modifications are "persisted" into cache, which has again bad | |
3737 side effects. | |
3738 | |
3739 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Removed | |
3740 prepareData(). The label creation for columns in the WST export will now | |
3741 take place in addWSTColumn(). With help of the master Artifact (I forgot | |
3742 this Artifact in my last commit) we are able to replace Q values with | |
3743 their named main value. | |
3744 | |
3745 2011-12-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3746 | |
3747 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3748 Cover 'locations' case for initial km of cross section artifacts. | |
3749 | |
3750 2011-12-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3751 | |
3752 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3753 (initialize): Eat ld_from from master artifact. | |
3754 (setup): Set cross_section.km to either masters km or the lowest | |
3755 defined cross-section line, whatever is bigger. | |
3756 | |
3757 2011-12-21 Ingo Weinzierl <ingo@intevation.de> | |
3758 | |
3759 flys/issue252 (W-INFO: Wasserspiegellagenberechnung / Mitführung der Jährlichkeiten in der Diagramm-/Ergbnisausgabe) | |
3760 | |
3761 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
3762 stripNamedMainValue(). The result of this function is a named main value's | |
3763 base name without declaration of a year. | |
3764 | |
3765 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a | |
3766 method pepareData() that is called in doOut() before the data supported by | |
3767 the current Facet is added using addData(). | |
3768 | |
3769 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Override | |
3770 the prepareData() method to reset the name of WQKms objects. The Qs in a | |
3771 waterlevel export should be the Q value or the named main value if the | |
3772 value fits to a named main value. | |
3773 | |
3774 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3775 | |
3776 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3777 Survive cases where the first dataset has an area-renderer assigned. | |
3778 | |
3779 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3780 | |
3781 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: | |
3782 Store additional parameter (whether or not to fill everything in | |
3783 between two curves.) | |
3784 | |
3785 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3786 Deliver additional info from artifact. | |
3787 | |
3788 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3789 Evaluate new parameter. | |
3790 | |
3791 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3792 | |
3793 * doc/conf/themes.xml: Add transparency setting to area theme style. | |
3794 | |
3795 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Helper to | |
3796 access transparency setting in theme. | |
3797 | |
3798 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
3799 Respect transparency setting. | |
3800 | |
3801 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3802 | |
3803 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
3804 Subclass BlackboardDataFacet to provide data for area calculation. | |
3805 | |
3806 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3807 Cast data to WKms instead of WQKms. | |
3808 | |
3809 2011-12-20 Ingo Weinzierl <ingo@intevation.de> | |
3810 | |
3811 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3812 Use a ';' as seperator between Qs and Ws. | |
3813 | |
3814 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3815 | |
3816 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java | |
3817 (doOut, doArea): Added handling for areafacets. Code yet mostly | |
3818 copied from CrossSectionGenerator. | |
3819 | |
3820 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3821 | |
3822 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
3823 Refactoring, subclass BlackboardDataFacet, remove duplicate code. | |
3824 | |
3825 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3826 | |
3827 Cosmetics. | |
3828 | |
3829 * doc/conf/artifacts/winfo.xml, | |
3830 src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3831 Renamed facet for consistency reasons. | |
3832 | |
3833 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3834 | |
3835 Make Waterlevelfacet deliver data via blackbord. | |
3836 | |
3837 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
3838 Subclass BlackboardDataFacet. | |
3839 | |
3840 2011-12-20 Ingo Weinzierl <ingo@intevation.de> | |
3841 | |
3842 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3843 Create all formatted string labels for Ws and Qs in this class, because | |
3844 this class is the only instance that knows that there are double values | |
3845 to format. | |
3846 | |
3847 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3848 | |
3849 Introduced new Facet that will deliver whatever getData returns via | |
3850 blackbord under key which is defined by convention. Attention, the | |
3851 data is not cached if handled this way. | |
3852 | |
3853 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
3854 New facet, will be useful for easing implementation of facets that | |
3855 can contribute to area-computations. | |
3856 | |
3857 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3858 | |
3859 * src/main/java/de/intevation/flys/exports/VisibleAttribute.java: | |
3860 Removed obsolete imports. | |
3861 | |
3862 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3863 | |
3864 Removed obsolete imports. | |
3865 | |
3866 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, | |
3867 src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, | |
3868 src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java, | |
3869 src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
3870 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3871 Removed obsolete imports. | |
3872 | |
3873 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3874 | |
3875 With StableXYDifferenceRenderer, create legend items in rectangular | |
3876 form, to discern "line" from "area" in legend. | |
3877 | |
3878 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java | |
3879 (legendLine, legendShape): Renamed. | |
3880 (getLegendItem): Create LegendItem with fill, use PositivePaint for | |
3881 that. | |
3882 | |
3883 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3884 | |
3885 Added further 'area' infrastructure. | |
3886 | |
3887 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
3888 New, "area dataset". | |
3889 | |
3890 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
3891 (doOut): Use helper to decide if facet is an 'area' facet. | |
3892 (doArea): Construct StyledAreaSeriesCollection instead of two | |
3893 dataseries. | |
3894 | |
3895 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3896 (AxisDataset.isArea): Distinguish area datasets with instanceof. | |
3897 (AxisDataset.addArea): New. Replaces addAreaDataset. | |
3898 (addAreaSeries): Simplified with new custom SeriesCollection. | |
3899 (applyTheme): Register and style StableXYDifferenceRenderer for | |
3900 StyledAreaSeriesCollections. | |
3901 Added various TODOs and debug output to stabilize development. | |
3902 | |
3903 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3904 | |
3905 * doc/conf/artifacts/winfo.xml: Added facets to compatibility | |
3906 matrices. | |
3907 | |
3908 * doc/conf/themes.xml: Added Area theme defaults. | |
3909 | |
3910 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3911 | |
3912 Lay ground for having areas in longitudinal section diagrams, too. | |
3913 This is done by different naming of the facets. | |
3914 | |
3915 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3916 Make the name dynamic. | |
3917 | |
3918 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3919 Added further facet types, helper. | |
3920 | |
3921 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: | |
3922 Store name for facets in data item, restrict access to some fields. | |
3923 | |
3924 * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
3925 Use AreaArtifacts data item to use name for facets. | |
3926 | |
3927 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3928 | |
3929 Cosmetics. | |
3930 | |
3931 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java, | |
3932 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
3933 src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
3934 Doc. | |
3935 | |
3936 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
3937 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
3938 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
3939 Whitespace. | |
3940 | |
3941 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Doc and | |
3942 whitespace. | |
3943 | |
3944 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3945 | |
3946 * src/main/java/de/intevation/flys/utils/ThemeUtil.java | |
3947 (parseBoolean): New, extracted, updated callers. | |
3948 (parseFillColorField, parseShowBorder): New, for area styles. | |
3949 | |
3950 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3951 | |
3952 flys/issue202 (W-INFo: Wasserspiegellagenberechnung / Vorbelegung Strecke) | |
3953 | |
3954 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
3955 Added a system property which is used to determine, if the DESCRIBE | |
3956 document of an Artifact should include default values (values, that have | |
3957 been inserted by the user some time ago) or not. The default case is, | |
3958 that the DESCRIBE does NOT include default values. To enable default | |
3959 values, set "flys.use.default.values" to "true". | |
3960 | |
3961 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3962 | |
3963 flys/issue419 (Themen-Name "Q(null)" bei W bei ungl. A.) | |
3964 | |
3965 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
3966 Use correct variable to create Facet names. | |
3967 | |
3968 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3969 | |
3970 flys/issue380 (W-INFO / Überschwemmungskarte, falsches DGM) | |
3971 | |
3972 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
3973 convinience method that returns a parameter of FLYSArtifact as Integer. | |
3974 | |
3975 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Override | |
3976 validate() to determine, if the DGM selected by the user is valid for the | |
3977 current calculation range and river. | |
3978 | |
3979 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3980 | |
3981 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3982 Roll-back accidentally committed changes. | |
3983 | |
3984 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3985 | |
3986 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
3987 (doOut): Hide 'invisible' (deleted) themes from Outgenerators. | |
3988 | |
3989 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3990 | |
3991 Added area.name data item and access to areaartifact. | |
3992 | |
3993 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3994 Rephrased debug output, do survive case where only one curve is | |
3995 given for area calculation (this is the "above" or "under" case). | |
3996 | |
3997 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java | |
3998 (getAreaName): Access "area.name" data item. | |
3999 | |
4000 * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
4001 Respect area.name data of artifact when reproducing facets. | |
4002 | |
4003 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4004 | |
4005 * doc/conf/conf.xml: Fix, accidentally added wrong factory in last | |
4006 commit. | |
4007 | |
4008 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4009 | |
4010 * doc/conf/conf.xml: Register area artifact factory. | |
4011 | |
4012 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4013 | |
4014 * doc/conf/artifacts/winfo.xml: Added area artifacts to cross-section | |
4015 compatibility matrix. | |
4016 | |
4017 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4018 | |
4019 Add area dataseries when facet delivering one. | |
4020 | |
4021 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
4022 (doOut): Handle area facets. | |
4023 (doArea): Register areas for area facets. | |
4024 | |
4025 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4026 | |
4027 Add simple area registerig functions. | |
4028 | |
4029 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4030 (AxisDataset.addAreaDataset): New, add an area dataset. | |
4031 (AxisDataset.isArea): New. | |
4032 (addAreaSeries): New. Add Area Dataset. | |
4033 (applyThemes): Pass info if we have an area, to set different | |
4034 renderer. | |
4035 | |
4036 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4037 | |
4038 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
4039 Added convenience function and easy sybclassing. | |
4040 | |
4041 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4042 | |
4043 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4044 Register AREA ("area") facet type. | |
4045 | |
4046 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4047 | |
4048 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
4049 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
4050 Register blackboard key uuid+index and respond with data to it, as | |
4051 assumed by the areaartifact and facet. | |
4052 | |
4053 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4054 | |
4055 Added partial area-infrastructure. | |
4056 | |
4057 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, | |
4058 src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, | |
4059 src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
4060 New artifact, facet and state for area rendering. | |
4061 | |
4062 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4063 | |
4064 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Defined an | |
4065 interface YAxisWalker that allows to walk over each Y axis definition in | |
4066 subclasses. This walker can be retrieved using the new getYAxisWalker() | |
4067 method. The AxisSections are built in this class now. | |
4068 | |
4069 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4070 Implemented the YAxisWalker interface and the getYAxisWalker() method. | |
4071 Removed the code to build AxisSections. | |
4072 | |
4073 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
4074 Implemented getYAxisLabel(int pos) and getYAxisWalker(). | |
4075 | |
4076 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4077 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
4078 Implemented the getYAxisWalker() method. | |
4079 | |
4080 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4081 | |
4082 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4083 Some optimizations during out() operation - the CollectionAttribute is | |
4084 parsed a single time now (*i guess*). This code really needs some | |
4085 refactoring! | |
4086 | |
4087 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4088 | |
4089 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4090 Added an INFO message that displays the duration time for the out() | |
4091 operation. | |
4092 | |
4093 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4094 | |
4095 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4096 Calls super.buildAxisSections(). | |
4097 | |
4098 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4099 Implemented the method buildAxisSections(). The result list will contain | |
4100 an AxisSection for the X axis. | |
4101 | |
4102 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4103 | |
4104 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Bugfix: | |
4105 Add new Outputs to the current CollectionAttribute if no old one is | |
4106 existing. | |
4107 | |
4108 2011-12-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4109 | |
4110 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
4111 Directly fetch key/value pairs when writing a collection attribute. | |
4112 | |
4113 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4114 | |
4115 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added new | |
4116 functions that allow parsing a ChartSettings object from DOM Node. | |
4117 | |
4118 * src/main/java/de/intevation/flys/collections/AttributeParser.java: Parse | |
4119 the Settings of each Output. | |
4120 | |
4121 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4122 | |
4123 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
4124 Added a method to set a new Settings object for a specific Output and a | |
4125 method to clear the list of Facets of a specific Output. | |
4126 | |
4127 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: The | |
4128 AttributeWriter no longer creates new CollectionAttributes - it only | |
4129 modifies the old CollectionAttribute. At first, it clears the Facets of | |
4130 all Outputs. Finally, the merged Facets are added to the Outputs. | |
4131 | |
4132 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4133 Added the CollectionAttribute to the AttributeWriters constructor. | |
4134 | |
4135 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
4136 | |
4137 * src/main/java/de/intevation/flys/exports/DoubleAttribute.java: New. An | |
4138 Attribute that stores double values. | |
4139 | |
4140 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods | |
4141 to set values for 'fixation', 'font-size', 'lower' and 'upper'. | |
4142 | |
4143 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4144 Set new attributes mentioned above for each axis' AxisSection. | |
4145 | |
4146 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
4147 | |
4148 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods | |
4149 to set the axis label and id. | |
4150 | |
4151 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Improved | |
4152 the ChartSettings that will now contain a set of AxisSections. The new | |
4153 buildAxisSections() method in this class is not implemented and needs to | |
4154 be implemented by subclasses. | |
4155 | |
4156 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4157 Override buildAxisSections() of XYChartGenerator to create an AxisSection | |
4158 for each axis that is able to be displayed in this sort of chart. In | |
4159 addition, there is a new method getYAxisLabel(int) that returns the label | |
4160 for a specific Y axis. | |
4161 | |
4162 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
4163 | |
4164 * src/main/java/de/intevation/flys/exports/IntegerAttribute.java: New. | |
4165 Concrete subclass of a DefaultAttribute for storing integer values. | |
4166 | |
4167 * src/main/java/de/intevation/flys/exports/LegendSection.java: New. A | |
4168 concrete Section subclass to store legend specific attributes. | |
4169 | |
4170 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
4171 src/main/java/de/intevation/flys/exports/StringAttribute.java: Removed | |
4172 needless import of org.w3c.dom.Attr. | |
4173 | |
4174 * src/main/java/de/intevation/flys/exports/ChartSettings.java: ChartSettings | |
4175 is able to store a Section for legends now. | |
4176 | |
4177 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
4178 methods to retrieve the font size of legends and if the legend should be | |
4179 visible or not. In addition, the ChartSettings returned by this instance | |
4180 will now contain a LegendSection as well. | |
4181 | |
4182 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
4183 | |
4184 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Introduced | |
4185 methods getChartSubtitle() and isGridVisible(). getChartSubtitle() returns | |
4186 in this implementation null. Concrete subclasses should override this | |
4187 mehtod if they require subtitles in charts. isGridVisible() determines if | |
4188 the grid in the chart should be visible or not. This method return always | |
4189 true in this implementation. | |
4190 In addition, the Settings object returned by getSettings() will now have a | |
4191 ChartSection set properly. | |
4192 | |
4193 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4194 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4195 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4196 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4197 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4198 Override getChartSubtitle(). | |
4199 | |
4200 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
4201 | |
4202 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4203 Prepare the OutGenerator (process each of the Output's Facets) during the | |
4204 describe() operation to be able to return an initial Settings object. | |
4205 | |
4206 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
4207 | |
4208 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
4209 src/main/java/de/intevation/flys/exports/VisibleAttribute.java, | |
4210 src/main/java/de/intevation/flys/exports/StringAttribute.java: Fixed wrong | |
4211 usage of DOM operations. | |
4212 | |
4213 2011-12-14 Ingo Weinzierl <ingo@intevation.de> | |
4214 | |
4215 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
4216 src/main/java/de/intevation/flys/exports/VisibleAttribute.java, | |
4217 src/main/java/de/intevation/flys/exports/StringAttribute.java: New. | |
4218 Concrete subclasses of a DefaultAttribute. | |
4219 | |
4220 * src/main/java/de/intevation/flys/exports/ChartSettings.java, | |
4221 src/main/java/de/intevation/flys/exports/AxisSection.java, | |
4222 src/main/java/de/intevation/flys/exports/ChartSection.java: | |
4223 Implementations for chart settings. WORK IN PROGRESS! | |
4224 | |
4225 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Override | |
4226 the getSettings() method. The implementation here returns a ChartSettings | |
4227 instance. | |
4228 | |
4229 * src/main/java/de/intevation/flys/exports/EmptySettings.java: Modified the | |
4230 node name of the settings ("art:settings" -> "settings"). | |
4231 | |
4232 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4233 | |
4234 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4235 Cosmetics, doc. | |
4236 | |
4237 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4238 | |
4239 Cosmetics. | |
4240 | |
4241 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
4242 Remove needless imports. | |
4243 | |
4244 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4245 | |
4246 Fix/Guard certain misconditions. | |
4247 | |
4248 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Do | |
4249 not crash when given null-range. | |
4250 | |
4251 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
4252 Do not crash when given malformed array. | |
4253 | |
4254 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4255 | |
4256 Cosmetics. | |
4257 | |
4258 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, | |
4259 ChangeLog: Whitespace cosmetic. | |
4260 | |
4261 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4262 Annotation cosmetic. | |
4263 | |
4264 * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: | |
4265 Convenience cosmetic. | |
4266 | |
4267 * src/main/java/de/intevation/flys/utils/DataUtil.java: | |
4268 vim-magicosmetic. | |
4269 | |
4270 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4271 | |
4272 Implement new WaterLineArtifact where needed so far. | |
4273 | |
4274 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
4275 Declare that we implement WaterLineArtifact. | |
4276 | |
4277 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
4278 (getWaterLines): Implement to fulfil new WaterLineArtifact- | |
4279 interface-impl. Also generate new Facet. | |
4280 | |
4281 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
4282 Do not depend on WINFOArtifacts, but on WaterLineArtifacts instead. | |
4283 | |
4284 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4285 | |
4286 Added interface WaterLineArtifact to be implemented by artifacts | |
4287 that know how to create a water line "against" a cross section. | |
4288 | |
4289 * src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java: | |
4290 New, straight-forward interface. | |
4291 | |
4292 2011-12-14 Ingo Weinzierl <ingo@intevation.de> | |
4293 | |
4294 * src/main/java/de/intevation/flys/exports/EmptySettings.java: An | |
4295 implementation of the Settings interface defined in the artifact-database | |
4296 module. This implementation accepts no Section objects at all and creates | |
4297 an empty "settings" Node in its toXML() operation. | |
4298 | |
4299 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Defined a new | |
4300 method getSettings() that returns a Settings instance. | |
4301 | |
4302 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
4303 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
4304 src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
4305 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
4306 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
4307 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
4308 Implemented the getSettings() operation. All OutGenerators will currently | |
4309 return an instance of EmptySettings. | |
4310 | |
4311 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4312 Before the DESCRIBE document is created, we gonna evaluate each Output | |
4313 defined in the Collection's attribute document, if it has a Settings | |
4314 object set. If this is not the case, the relevant OutGenerator is called | |
4315 to retrieve a new instance of Settings. | |
4316 | |
4317 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
4318 Append the Settings of Outputs to the Output nodes in the XML | |
4319 representation. | |
4320 | |
4321 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4322 | |
4323 Recommend cross-sections. | |
4324 | |
4325 * doc/conf/meta-data.xml: When having a cross-section out, recommend | |
4326 respective artifacts. | |
4327 | |
4328 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4329 | |
4330 Register factory for CrossSectionArtifacts. | |
4331 | |
4332 * doc/conf/conf.xml: Register CrossSectionArtifact-Factory. | |
4333 | |
4334 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
4335 | |
4336 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
4337 New. This class will store the information provided in the Collection's | |
4338 attribute (which is a DOM document). | |
4339 | |
4340 * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: | |
4341 Store an instance of CollectionAttribute and append its XML representation | |
4342 to the DESCRIBE document. | |
4343 | |
4344 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Removed | |
4345 all DOM operations from this writer. Its new task is to create a new | |
4346 CollectionAttribute object which represents a merged version of the old | |
4347 CollectionAttribute and the information provided by the Collection's child | |
4348 Artifacts. | |
4349 | |
4350 * src/main/java/de/intevation/flys/collections/AttributeParser.java: The | |
4351 result of AttributeParser's parse() operation is a CollectionAttribute | |
4352 object now. The methods getOuts() and getFacets() are as of now proxy | |
4353 methods that call the relevant methods of CollectionAttribute. | |
4354 | |
4355 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4356 Some structural changes in the process to build the attribute Document of | |
4357 the Collection's DESCRIBE. We will no longer work with Document during | |
4358 this process but with instances of CollectionAttribute. | |
4359 | |
4360 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4361 | |
4362 Server-side of newer Cross-Section diagram construction architecture. | |
4363 | |
4364 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
4365 (searchCrossSectionKmLine, getCrossSectionSnapKm), | |
4366 (getCrossSectionData): Removed, most functionality contained in | |
4367 CrossSectionArtifact. | |
4368 (getWaterLines): Now get CrossSectionLines to calculate water line. | |
4369 | |
4370 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
4371 Get a CrossSectionLine from blackboard. | |
4372 | |
4373 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
4374 Hard TODO, commented out function needed for subtitle to allow | |
4375 compilation. | |
4376 | |
4377 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
4378 Added Empty-Dataset- guard. | |
4379 | |
4380 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4381 | |
4382 Cosmetics. | |
4383 | |
4384 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
4385 Cosmetics. | |
4386 | |
4387 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
4388 | |
4389 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java, | |
4390 src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4391 Removed superfluous imports. | |
4392 | |
4393 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
4394 | |
4395 * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: | |
4396 New. This class helps generating the DESCRIBE document of a collection. | |
4397 | |
4398 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4399 Moved some of the code to create the DESCRIBE document out to | |
4400 CollectionDescriptionHelper. | |
4401 | |
4402 2011-12-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4403 | |
4404 Resolve todo about wrongly named cross sections. | |
4405 Open StaticState to allow that facets survive a compute. | |
4406 | |
4407 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java | |
4408 (computeAdvance, computeFeed, computeInit): Override to call | |
4409 staticCompute. | |
4410 (staticCompute): New. Do nothing but be able to be overridden. | |
4411 | |
4412 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java | |
4413 (setup): Fetch facets name from db (resolves todo). | |
4414 (getCurrentState): override staticstates staticcompute to let | |
4415 facets survive a compute. | |
4416 | |
4417 2011-12-12 Ingo Weinzierl <ingo@intevation.de> | |
4418 | |
4419 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java, | |
4420 src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java: Renamed | |
4421 JobExecutor to WSPLGENCallable (because it is a Callable now). In addition | |
4422 to the call() method which starts the WSPLGEN process, this Callable | |
4423 offers a cancelWSPLGEN() method to destroy a running WSPLGEN process. | |
4424 | |
4425 * src/main/java/de/intevation/flys/wsplgen/WSPLGENFuture.java: A FutureTask | |
4426 that overrides cancel(boolean). Before this instance call | |
4427 super.cancel(boolean), it executes WSPLGENCallable.cancelWSPLGEN() to kill | |
4428 a running WSPLGEN process. | |
4429 | |
4430 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: The Scheduler is | |
4431 no longer a Runnable. It makes now use of a ScheduledThreadPoolExecutor to | |
4432 schedule the incoming WSPLGENJobs. The ScheduledThreadPoolExecutor has a | |
4433 fixed number of worker threads that process the jobs. The number is 1 per | |
4434 default; it can be modified using a System property "wsplgen.max.threads". | |
4435 | |
4436 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
4437 a string constant SCHEDULER. | |
4438 | |
4439 * src/main/java/de/intevation/flys/wsplgen/SchedulerSetup.java: A | |
4440 LifetimeListener that currently implements the systemUp() method to create | |
4441 an instance of Scheduler. After its creation, the Scheduler is put into | |
4442 the GlobalContext using FLYSContext.SCHEDULER as key. | |
4443 | |
4444 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
4445 Fetch the Scheduler from GlobalContext. | |
4446 | |
4447 * doc/conf/conf.xml: Registered SchedulerSetup as LifetimeListener. | |
4448 | |
4449 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4450 | |
4451 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | |
4452 (describe): Add data items to StaticFLYSArtifacts describe-doc. | |
4453 | |
4454 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4455 | |
4456 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
4457 (addDefaultChartOutput): Convenienve function to add a chart-output. | |
4458 | |
4459 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4460 | |
4461 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
4462 Play nice with CrossSectionArtifact. Employ blackboard. | |
4463 | |
4464 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4465 Spawn a CrossSectionFacet, handle various data. | |
4466 | |
4467 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
4468 Do not produce CrossSectionFacets anymore, these now "belong" to | |
4469 CrossSectionArtifacts. | |
4470 | |
4471 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4472 | |
4473 * doc/conf/cache.xml: Added cross_sections cache. | |
4474 | |
4475 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4476 | |
4477 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java: | |
4478 (getCrossSection, getCrossSectionUncached): New, access specific | |
4479 CrossSection, employ caching. | |
4480 | |
4481 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4482 | |
4483 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4484 New artifact to handle cross-section access. | |
4485 | |
4486 2011-12-09 Raimund Renkert <raimund.renkert@intevation.de> | |
4487 | |
4488 Issue 413. | |
4489 | |
4490 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
4491 Apply point size from theme attribute linewidth. | |
4492 | |
4493 2011-12-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4494 | |
4495 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
4496 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
4497 src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
4498 src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
4499 Cosmetics. | |
4500 | |
4501 2011-12-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4502 | |
4503 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
4504 Documentation added, let a value be its own neighbour (distance 0). | |
4505 | |
4506 2011-12-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4507 | |
4508 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
4509 Added "Bezugslinie" to list of calculation alternatives. | |
4510 | |
4511 * src/main/resources/messages.properties, | |
4512 src/main/resources/messages_de_DE.properties, | |
4513 src/main/resources/messages_de.properties: Added I18N. | |
4514 | |
4515 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4516 | |
4517 Further flys/issue420 fix (No Discharge Curves for Mosel). | |
4518 | |
4519 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4520 (includeYRange, mergeRanges): Moved NaN-guard to lowest level. | |
4521 (combineXRanges): Also NaN guard the X Axis extent. | |
4522 | |
4523 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4524 | |
4525 Partial fix for flys/issue420 (Berechnete Abflusskurve: Kein Diagramm für | |
4526 Mosel). Protect axis extent calculation from empty or invalid | |
4527 datasets. | |
4528 | |
4529 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4530 (includeRange, includeYRange): Renamed, updated callers. | |
4531 (includeYRange): Protect from merging extent with NaNs. | |
4532 (debugDatasets): Be more verbose on the datasets. | |
4533 (zoom): Doc. | |
4534 | |
4535 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4536 | |
4537 Fix flys/issue423 (Diagramm: Hauptwerte bei Abflusskurve am Pegel | |
4538 werden an Y-Achse nicht angezeigt) - show not "raw" (vs interpolated) | |
4539 values at Gauge. | |
4540 | |
4541 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
4542 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
4543 Add parameterization to let facet know whether to fetch data at | |
4544 Gauges or at Artifacts position. | |
4545 | |
4546 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
4547 Let the MainValueFacets know whether to ask for interpolated | |
4548 MainValues; (do not interpolate for Gauges Main Values). | |
4549 (getMainValuesQ, getMainValuesW): Added parameter to control | |
4550 interpolation. | |
4551 | |
4552 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4553 | |
4554 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified | |
4555 prefix constants for Mapserver layers and renamed constants (which have | |
4556 been postfixes before). | |
4557 | |
4558 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Adjusted | |
4559 usage of Mapserver constants to the changes described above. | |
4560 | |
4561 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4562 | |
4563 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
4564 Bugfix: Evaluate the correct parameter whether to set the floodplain or | |
4565 not. In addition, the scenario parameter used by WSPLGEN is now set | |
4566 correctly. | |
4567 | |
4568 >>>>>>> .r3356 | |
4569 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4570 | |
4571 Allow longitudinal_section.q facets in wdiff states output. | |
4572 | |
4573 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets | |
4574 to w-diff states out compatibility- matrix. | |
4575 | |
4576 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4577 | |
4578 Refactored Longitudinal*/WDiff-*Generator hierarchy and change axis | |
4579 ordering, resolved label-i18n TODO. | |
4580 | |
4581 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4582 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4583 Merge, avoid duplicate code, fix axis ordering in w-diff diagram, | |
4584 label in ls-diagramm. | |
4585 | |
4586 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4587 | |
4588 * src/main/resources/messages.properties, | |
4589 src/main/resources/messages_de_DE.properties, | |
4590 src/main/resources/messages_en.properties, | |
4591 src/main/resources/messages_de.properties: Added missing state titles. | |
4592 | |
4593 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4594 | |
4595 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
4596 Do not include zero on first axis. | |
4597 | |
4598 2011-12-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4599 | |
4600 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4601 (buildArtifactNode): Include artifacts state data in description | |
4602 document of collection. | |
4603 | |
4604 2011-11-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4605 | |
4606 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4607 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4608 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
4609 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
4610 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4611 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4612 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
4613 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
4614 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
4615 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4616 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4617 src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
4618 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4619 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
4620 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4621 Removed superfluous imports. | |
4622 | |
4623 2011-11-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4624 | |
4625 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4626 Removed import to make it compileable again. | |
4627 | |
4628 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4629 | |
4630 Introduce pre-rendering inter-facet communication phase ('blackboard | |
4631 pass'). | |
4632 | |
4633 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
4634 (doBlackboardPass): New. Before actually calling doOut, bundle | |
4635 ArtifactAndFacets and let them register | |
4636 themselfes as DataProvider in CallContext if they | |
4637 want ("announce on blackboard"). | |
4638 | |
4639 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4640 | |
4641 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java | |
4642 (doOut): Adjusted signature. | |
4643 | |
4644 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4645 | |
4646 Changed doOut signature to use ArtifactAndFacet, which will be | |
4647 side effect of upcoming "blackboard" feature. | |
4648 | |
4649 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
4650 (getRangesForDataset, getRangesForAxis): Renamed, removed TODO. | |
4651 | |
4652 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java | |
4653 (createAxis): Update call to XYChartGenerator.getRangesForAxis, | |
4654 cosmetics. | |
4655 | |
4656 * src/main/java/de/intevation/flys/exports/OutGenerator.java | |
4657 (doOut): Changed Signature to accet ArifactAndFacet instead of | |
4658 Artifact and Facet. | |
4659 | |
4660 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4661 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4662 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
4663 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
4664 src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
4665 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4666 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4667 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
4668 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
4669 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4670 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4671 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4672 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java | |
4673 (doOut): Adjusted to new signature. | |
4674 | |
4675 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
4676 (adjustAxes): Removed, we do not need a (manual) second axis. | |
4677 | |
4678 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4679 | |
4680 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4681 Fix compilation, use features of XYChartGenerator. | |
4682 | |
4683 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4684 Set default behaviour such that 0 is not included in ranges. | |
4685 | |
4686 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
4687 Set behaviour of axis such that 0 is not (automagically) included. | |
4688 | |
4689 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4690 | |
4691 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
4692 Fix wrong documentation. | |
4693 | |
4694 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4695 | |
4696 Fix LongitudinalSections multi-axes plotting behavior. | |
4697 | |
4698 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4699 Removed obsolete functions, use better working multi-axis | |
4700 magic by XYChartGenerator. | |
4701 | |
4702 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4703 | |
4704 Overhaul dataset/axis/renderer housekeeping in Mother of all | |
4705 ChartGenerators. | |
4706 | |
4707 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4708 Refactored, keep axis/rendering relevant information in objects | |
4709 of new class AxisDataset. Removed some obsolete code while adding | |
4710 documentation. | |
4711 | |
4712 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4713 | |
4714 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
4715 Added the implementation of the 'Bezugslinienverfahren'. Should | |
4716 be complete but needs testing! | |
4717 TODO: Setup a Calculation and integrate it into WINFO. | |
4718 | |
4719 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4720 | |
4721 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4722 Refactored the code for the "berechnete Abflusskurve" to enable | |
4723 the "Bezugslinienverfahren" to use the same code paths. It also | |
4724 removes a good deal of already existing code duplication. | |
4725 | |
4726 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4727 | |
4728 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(findQsForW): | |
4729 Added method findQsForW(w, km) to retrieve the Qs that correspond | |
4730 for the given w and km. | |
4731 | |
4732 This is to be called when doing a "W auf freier Strecke" calculation | |
4733 to find out the Qs belonging to the user given W. | |
4734 | |
4735 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, | |
4736 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4737 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4738 Removed superfluous imports. | |
4739 | |
4740 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4741 | |
4742 Fix bug when adding Q data in LongitudinalSectionGenerator. | |
4743 | |
4744 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4745 Add data from Q -Facet as Q over Km points. | |
4746 | |
4747 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4748 | |
4749 Added handling of empty plots. | |
4750 | |
4751 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4752 (createAxes, removeEmptyRangeAxes): Survive empty datasets map, create | |
4753 primary axis. | |
4754 (recoverEmptyPlot): New. | |
4755 | |
4756 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4757 | |
4758 Let first visible axis be always on the left. | |
4759 | |
4760 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4761 (createAxes): When creating axes, keep track of which is the first | |
4762 one. Set its location to "left". | |
4763 | |
4764 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4765 | |
4766 Use multiple axis in relevant generators. | |
4767 | |
4768 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4769 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4770 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4771 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4772 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4773 (createYAxis): Implemented. | |
4774 Define and use YAXIS enum for axes. | |
4775 | |
4776 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4777 | |
4778 Fix theming and legend items for plot with multiaxis feature. | |
4779 Decouple renderer index from dataset index. | |
4780 | |
4781 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4782 (applyThemes): Do not get renderer based on dataset/axis-index but | |
4783 count. | |
4784 | |
4785 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4786 | |
4787 In XYChartGenerators allow more than two datasets. | |
4788 Assign axis to indices of datasets, do not show axis if corresponding | |
4789 dataset is set to be not visible. | |
4790 Do proper axis-setting in LongitudinalSectionGenerator only (other | |
4791 will follow). Based on a patch by Sascha Teichmann. | |
4792 | |
4793 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4794 Keep relation between index and dataset, once its added. Compute | |
4795 ranges per index. Allow subclasses to override createAxes to specify | |
4796 internationalized labels etc. | |
4797 | |
4798 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4799 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4800 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4801 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4802 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4803 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
4804 Add datasets to first index. | |
4805 | |
4806 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4807 Implement createYAxis to create correct first, second and third | |
4808 axis. Added enum to easy identification of axis. Stripped down | |
4809 adjustAxis which was used to create second axis. | |
4810 Add datasets at correct indices. | |
4811 | |
4812 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4813 | |
4814 * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, | |
4815 src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, | |
4816 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4817 Cosmetics, docs. | |
4818 | |
4819 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4820 | |
4821 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
4822 Cosmetics, docs. | |
4823 | |
4824 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4825 | |
4826 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
4827 Cosmetics, docs. | |
4828 | |
4829 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4830 | |
4831 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
4832 Resolved TODO about caching certain WstValueTables. | |
4833 | |
4834 2011-11-22 Ingo Weinzierl <ingo@intevation.de> | |
4835 | |
4836 * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: New. | |
4837 This Artifact is used to allow users adding external WMS layers to their | |
4838 floodmaps. An ExternalWMSArtifact stores an URL of a WMS, the name and the | |
4839 title of the WMS layer. The internal State extends WMSBackgroundState. | |
4840 | |
4841 * doc/conf/conf.xml: Registered the ExternalWMSArtifact. | |
4842 | |
4843 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a | |
4844 new type "floodmap.externalwms" which is used by the ExternalWMSArtifact. | |
4845 | |
4846 * doc/conf/artifacts/winfo.xml: Allowed the "floodmap.externalwms" facet for | |
4847 floodmaps. | |
4848 | |
4849 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
4850 Some refactoring to allow easier subclassing. | |
4851 | |
4852 2011-11-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4853 | |
4854 Fixed flys/411. | |
4855 | |
4856 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
4857 Use different queries to avoid costy joins. | |
4858 | |
4859 2011-11-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4860 | |
4861 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
4862 Use different queries to avoid costy joins. Patch by Sascha | |
4863 Teichmann, minor typo-fix. | |
4864 | |
4865 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4866 | |
4867 * doc/conf/artifacts/winfo.xml: Added other.wkms.interpol facet | |
4868 to compatibility matrix for computed discharge curves. | |
4869 | |
4870 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4871 | |
4872 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
4873 Resolve cosmetic todo, use importData-convenience method. | |
4874 | |
4875 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4876 | |
4877 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4878 Handle STATIC_WKMS_INTERPOL and WQ/Points as Annotations. | |
4879 | |
4880 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4881 | |
4882 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4883 Give Facet different name when its a flood*, so that it can be | |
4884 understood to be e.g. a flood-protection further down the processing | |
4885 line. | |
4886 | |
4887 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4888 | |
4889 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4890 Prevent ArrayIndexOutOfBounds, log method entry. | |
4891 | |
4892 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4893 | |
4894 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4895 Added new Facet Type: Interpolated W/Km values. | |
4896 | |
4897 2011-11-16 Ingo Weinzierl <ingo@intevation.de> | |
4898 | |
4899 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, | |
4900 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, | |
4901 src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Avoid | |
4902 WMS layer names that begin with digits. This would lead to invalid | |
4903 WMSGetFeatureInfo responses, where the name of a layer is the name of a | |
4904 XML node. | |
4905 | |
4906 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4907 | |
4908 * doc/conf/meta-data.xml: Added and use *_wq macros for interpolated | |
4909 w/q data (currently used in computed discharge curve only). | |
4910 | |
4911 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4912 | |
4913 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4914 Handle STATIC_WQ_ANNOTATION type facets, build and add annotations | |
4915 for these. | |
4916 | |
4917 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4918 | |
4919 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4920 Set Facet type (name) based on static datas name (special case | |
4921 everything starting with "height"). | |
4922 | |
4923 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4924 | |
4925 * doc/conf/artifacts/winfo.xml: Extended compatibility matrices. | |
4926 | |
4927 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4928 | |
4929 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4930 Added new STATIC_WQ_ANNOTATIONS Facet Type. | |
4931 | |
4932 2011-11-16 Ingo Weinzierl <ingo@intevation.de> | |
4933 | |
4934 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4935 Added a method isQueryable() that determines if a layer is queryable via | |
4936 WMS GetFeatureInfo request. This method returns false as default. | |
4937 | |
4938 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
4939 Override isQueryable(). All WMSDBLayerFacets are queryable via WMS | |
4940 GetFeatureInfo request. | |
4941 | |
4942 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4943 | |
4944 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4945 Added functionality to artifact to use single column wst | |
4946 interpolators. | |
4947 | |
4948 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4949 | |
4950 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
4951 Added methods to create WstValueTables (interpolators) for specific | |
4952 columns of wsts. | |
4953 | |
4954 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4955 | |
4956 * doc/conf/themes.xml: Added Point Style for other.wq data. | |
4957 | |
4958 2011-11-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4959 | |
4960 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4961 Do not re-evaluate constant size() in for-loops. | |
4962 | |
4963 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4964 | |
4965 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4966 Get ld_locations not locations data item to determine km. | |
4967 (getDataAsDouble): New helper function to get data item as double. | |
4968 | |
4969 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4970 | |
4971 * doc/conf/meta-data.xml: Recommend fixations for computed discharge | |
4972 curve outs, minor refactoring of dc conf. | |
4973 | |
4974 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4975 | |
4976 * doc/conf/conf.xml: Added wqinterpol factory to produce | |
4977 WQKmsInterpolArtifacts. | |
4978 | |
4979 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4980 | |
4981 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4982 Use StyledSeriesBuilder to add WQ data from WQKms to Series. | |
4983 | |
4984 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4985 | |
4986 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4987 Handle interpolated WQ data. | |
4988 | |
4989 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4990 | |
4991 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
4992 Adjusted to similar implementations. Added TODO about merging with | |
4993 these similar implementations. | |
4994 | |
4995 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4996 | |
4997 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4998 Removed logging noise, find better suited rows for interpolation. | |
4999 | |
5000 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5001 | |
5002 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
5003 Cache WstValueTables that were fetched by wst_id. | |
5004 | |
5005 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5006 | |
5007 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
5008 (getWstName): Fix and use SQL statement. | |
5009 | |
5010 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5011 | |
5012 * src/main/java/de/intevation/flys/artifacts/model/WQFacet.java, | |
5013 src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
5014 Added new Facet and Artifact to access W over Q data. | |
5015 | |
5016 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5017 | |
5018 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5019 (importData): New function to copy data from one artifact to | |
5020 another. | |
5021 | |
5022 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5023 | |
5024 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java | |
5025 (getTable): New methods to get WstValueTable for given wst_id. | |
5026 Prepolate Arrays with NaNs. | |
5027 | |
5028 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5029 | |
5030 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
5031 (getWKmsName): Fix definition. | |
5032 | |
5033 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5034 | |
5035 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
5036 (getWKmsName): New function. Get name (description) of a WST. | |
5037 | |
5038 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5039 | |
5040 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5041 Added new "other.wq"/STATIC_WQ Facet-Type, e.g. for fixations in | |
5042 discharge curves. | |
5043 | |
5044 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5045 | |
5046 Picky cosmetics. | |
5047 | |
5048 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java, | |
5049 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, | |
5050 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
5051 src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
5052 Cosmetics, docs. | |
5053 | |
5054 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5055 | |
5056 Added translations for Mosel, Elbe and Saar. | |
5057 | |
5058 * src/main/resources/messages.properties, | |
5059 src/main/resources/messages_de_DE.properties, | |
5060 src/main/resources/messages_en.properties, | |
5061 src/main/resources/messages_de.properties: Added translations | |
5062 for Mosel, Elbe, Saar. | |
5063 | |
5064 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5065 | |
5066 Added new interpolation mechanism to WstValueTable to interpolate | |
5067 given columns only. | |
5068 | |
5069 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java | |
5070 (linearW): New, interpolate a given columns w's between given rows. | |
5071 (interpolateWQColumnwise): New, interpolate between rows ws at a | |
5072 given column and km. | |
5073 | |
5074 2011-11-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5075 | |
5076 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5077 Minor doc added. | |
5078 | |
5079 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5080 | |
5081 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, | |
5082 src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, | |
5083 src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
5084 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5085 src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, | |
5086 src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
5087 Removed dead ';' from empty bodies. | |
5088 | |
5089 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5090 | |
5091 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5092 s/reset/resetQuick/s in TDoubleArrayLists. | |
5093 | |
5094 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5095 | |
5096 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5097 Added system properties 'waterlevel' and 'km'. Useful to | |
5098 init the UI with a given waterlevel and drawing the cross-sections | |
5099 at the given km. | |
5100 | |
5101 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5102 Spliting by NaNs definition holes _should_ work now. Needs | |
5103 some more testing. | |
5104 TODOs: | |
5105 - Use log4j instead of println for logging. | |
5106 - Subclass XYDifferenceRenderer instead of replacing it totally. | |
5107 | |
5108 2011-11-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5109 | |
5110 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5111 Draw water, too. | |
5112 | |
5113 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5114 First code to split datasets by NaNs. WIP. | |
5115 | |
5116 2011-11-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5117 | |
5118 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5119 Draw ground with StableXYDifferenceRenderer. | |
5120 | |
5121 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5122 Removed XYDatasetToZeroMapper stuff. Not needed any longer | |
5123 because we use rendereres on dataset basis now. | |
5124 | |
5125 * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: | |
5126 Removed.Not longer needed. | |
5127 | |
5128 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5129 | |
5130 * doc/conf/meta-data.xml: Include computed discharge curves in dc | |
5131 conf. | |
5132 | |
5133 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5134 | |
5135 * doc/conf/meta-data.xml: Somewhat unify user-part of dc config. | |
5136 | |
5137 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
5138 | |
5139 * doc/conf/themes.xml: Modified some floodmap styles and added a | |
5140 backgroundcolor attribute to polygon themes. | |
5141 | |
5142 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5143 Added support for backgroundcolor. | |
5144 | |
5145 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Parse | |
5146 backgroundcolor from theme document. If a value is given, the | |
5147 backgroundcolor is set on the Mapserver style. | |
5148 | |
5149 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
5150 | |
5151 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5152 Set correct Mapserver attribute name to adjust the width of a line. | |
5153 | |
5154 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
5155 | |
5156 * doc/conf/themes.xml: Added 'textcolor' and 'textsize' attributes to the | |
5157 existing 'Kms' theme. | |
5158 | |
5159 * doc/conf/mapserver/fontset.txt: Defined a 'DefaultFont' that is used as | |
5160 default font for Mapserver labels. | |
5161 | |
5162 * doc/conf/mapserver/db_layer.vm: Add a Mapserver LABELITEM if a value is | |
5163 provided by LayerInfo object. | |
5164 | |
5165 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added a | |
5166 getLabelItem() method that returns null as default. | |
5167 | |
5168 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override | |
5169 getLabelItem() to return "km" which is the database field that contains | |
5170 the kilometer information. | |
5171 | |
5172 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java, | |
5173 src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
5174 Added an attribute labelItem with appropriate getter/setter methods. | |
5175 | |
5176 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5177 Splitted up the internal class Clazz. Now, there are two new inner | |
5178 classes Style and Label that fulfill the appropriate Mapfile sections of | |
5179 Mapserver. | |
5180 | |
5181 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Also Read font | |
5182 attributes and add new Clazz Label for the Mapserver layer. | |
5183 | |
5184 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Set the | |
5185 "labelItem" attribute on the LayerInfo object used to fill DB layer | |
5186 templates. | |
5187 | |
5188 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5189 | |
5190 * doc/conf/meta-data.xml: Re-use macros to include more data to | |
5191 datacage in more situations. | |
5192 | |
5193 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
5194 | |
5195 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
5196 Removed needless imports. | |
5197 | |
5198 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
5199 | |
5200 * src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java: New | |
5201 WMSDBArtifact that creates facets for "fixpoints" relation. | |
5202 | |
5203 * doc/conf/artifacts/winfo.xml: Registered "floodmap.fixpoints" as valid | |
5204 "floodmap" facet. | |
5205 | |
5206 * doc/conf/conf.xml: Registered the new WMSFixpointsArtifact. | |
5207 | |
5208 * doc/conf/themes.xml: Added a theme for "floodmap.fixpoints". | |
5209 | |
5210 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5211 Facet type "floodmap.fixpoints". | |
5212 | |
5213 * doc/conf/meta-data.xml: Made "floodmap.fixpoints" available via datacage. | |
5214 | |
5215 * src/main/resources/messages.properties, | |
5216 src/main/resources/messages_de_DE.properties, | |
5217 src/main/resources/messages_en.properties, | |
5218 src/main/resources/messages_de.properties: Added titles for | |
5219 "floodmap.fixpoints" facets. | |
5220 | |
5221 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5222 | |
5223 * doc/conf/meta-data.xml: Refactored and (re)use macros. | |
5224 | |
5225 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
5226 | |
5227 * src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java: New | |
5228 WMSDBArtifact that creates facets for "buildings" relation. | |
5229 | |
5230 * doc/conf/artifacts/winfo.xml: Registered "floodmap.buildings" as valid | |
5231 "floodmap" facet. | |
5232 | |
5233 * doc/conf/conf.xml: Registered the new WMSBuildingsArtifact. | |
5234 | |
5235 * doc/conf/themes.xml: Added a theme for "floodmap.buildings". | |
5236 | |
5237 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5238 Facet type "floodmap.buildings". | |
5239 | |
5240 * doc/conf/meta-data.xml: Made "floodmap.buildings" available via datacage. | |
5241 | |
5242 * src/main/resources/messages.properties, | |
5243 src/main/resources/messages_de_DE.properties, | |
5244 src/main/resources/messages_en.properties, | |
5245 src/main/resources/messages_de.properties: Added titles for | |
5246 "floodmap.buildings" facets. | |
5247 | |
5248 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
5249 | |
5250 * src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java: New | |
5251 WMSDBArtifact that creates facets for "lines" relation. | |
5252 | |
5253 * doc/conf/artifacts/winfo.xml: Registered "floodmap.lines" as valid | |
5254 "floodmap" facet. | |
5255 | |
5256 * doc/conf/conf.xml: Registered the new WMSLineArtifact. | |
5257 | |
5258 * doc/conf/themes.xml: Added a theme for "floodmap.lines". | |
5259 | |
5260 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5261 Facet type "floodmap.lines". | |
5262 | |
5263 * doc/conf/meta-data.xml: Made "floodmap.lines" available via datacage. | |
5264 | |
5265 * src/main/resources/messages.properties, | |
5266 src/main/resources/messages_de_DE.properties, | |
5267 src/main/resources/messages_en.properties, | |
5268 src/main/resources/messages_de.properties: Added titles for facets. | |
5269 | |
5270 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5271 | |
5272 * doc/conf/meta-data.xml: Adjusted DC configuration to | |
5273 also allow heightmarks and base data in discharge longitudinal | |
5274 sections. Minor refac. | |
5275 | |
5276 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5277 | |
5278 * doc/conf/meta-data.xml: Adjusted DC configuration to let old | |
5279 calculations be available for discharge longitudinal sections. | |
5280 | |
5281 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5282 | |
5283 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
5284 Handle other WQKm and WKm Facets. | |
5285 | |
5286 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5287 | |
5288 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java | |
5289 (IS): New inner class with static method to allow queries whether | |
5290 a type belongs to a however-defined "group". | |
5291 | |
5292 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5293 | |
5294 * doc/conf/conf.xml: Reverted accidental commit. | |
5295 | |
5296 * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation | |
5297 for discharge longitudinal sections. | |
5298 | |
5299 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5300 | |
5301 * doc/conf/conf.xml: Reverted accidental commit. | |
5302 | |
5303 * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation | |
5304 for discharge longitudinal sections. | |
5305 | |
5306 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5307 | |
5308 Made discharge longitudinal section out compatible with annotations. | |
5309 | |
5310 * doc/conf/artifacts/winfo.xml: Added facets to compatibility list | |
5311 for discharge longitudinal section outs. | |
5312 | |
5313 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5314 | |
5315 Extracted Annotations-Macro in dc conf, recommend Annotations for | |
5316 discharge longitudinal sections. (Note correction two commits later). | |
5317 | |
5318 * doc/conf/conf.xml: Extracted annotations-macro, add recommendation | |
5319 for discharge longitudinal sections. | |
5320 | |
5321 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5322 | |
5323 Handle Annotations in DischargeLongitudinalSection diagrams. | |
5324 | |
5325 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
5326 Call doAnnotations for LONGITUDINAL_ANNOTATION facets. | |
5327 | |
5328 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5329 | |
5330 Resolve code duplicate. | |
5331 | |
5332 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java | |
5333 (doAnnotationsOut): Removed duplicate code. | |
5334 Theoretically handle WQKMS data. | |
5335 | |
5336 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
5337 Adjusted call to doAnnotationOut. | |
5338 | |
5339 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
5340 (doAnnotations): Doc from LongitudinalSectionGenerator. | |
5341 | |
5342 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5343 | |
5344 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5345 Include exception when logging issue with spline creation. | |
5346 | |
5347 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5348 | |
5349 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
5350 When during XPath evaluation an exception is thrown, log the | |
5351 expression that caused the trouble. | |
5352 | |
5353 2011-11-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5354 | |
5355 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5356 Use separate XYDataset for each curve. This is needed because | |
5357 "Raum/Flaeche" needs specialized renderers, which are not compatible | |
5358 with the standard renderers. | |
5359 | |
5360 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
5361 Removed superfluous import. | |
5362 | |
5363 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5364 | |
5365 * src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: New | |
5366 Artifact that is used to create WMS layers for floodplains in maps. | |
5367 | |
5368 * doc/conf/conf.xml: Registered the new WMSFloodplainArtifact. | |
5369 | |
5370 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5371 a new type 'floodmap.floodplain'. | |
5372 | |
5373 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.floodplain' facet | |
5374 for floodmaps. | |
5375 | |
5376 * doc/conf/themes.xml: Added a theme for 'floodmap.floodplain' facets. | |
5377 | |
5378 * doc/conf/meta-data.xml: Added configuration for 'floodplain'. | |
5379 | |
5380 * src/main/resources/messages.properties, | |
5381 src/main/resources/messages_de_DE.properties, | |
5382 src/main/resources/messages_en.properties, | |
5383 src/main/resources/messages_de.properties: Added facet titles for | |
5384 'floodmap.floodplain' facets. | |
5385 | |
5386 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5387 | |
5388 * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java: New | |
5389 Artifact that is used to create WMS layers for catchments in maps. | |
5390 | |
5391 * doc/conf/conf.xml: Registered the new WMSCatchmentArtifact. | |
5392 | |
5393 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5394 a new type 'floodmap.catchment'. | |
5395 | |
5396 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.catchment' facet | |
5397 for floodmaps. | |
5398 | |
5399 * doc/conf/themes.xml: Added a theme for 'floodmap.catchment' facets. | |
5400 | |
5401 * doc/conf/meta-data.xml: Added configuration for 'catchments'. | |
5402 | |
5403 * src/main/resources/messages.properties, | |
5404 src/main/resources/messages_de_DE.properties, | |
5405 src/main/resources/messages_en.properties, | |
5406 src/main/resources/messages_de.properties: Added facet titles for | |
5407 'floodmap.catchment' facets. | |
5408 | |
5409 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5410 | |
5411 * src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java: New | |
5412 Artifact that is used to create WMS layers for flood protected works. | |
5413 | |
5414 * doc/conf/conf.xml: Registered the new WMSHwsArtifact. | |
5415 | |
5416 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5417 a new type 'floodmap.hws'. | |
5418 | |
5419 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.hws' facet for | |
5420 floodmaps. | |
5421 | |
5422 * doc/conf/themes.xml: Added a theme for 'floodmap.hws' facets. | |
5423 | |
5424 * doc/conf/meta-data.xml: Added configuration for 'hws'. | |
5425 | |
5426 * src/main/resources/messages.properties, | |
5427 src/main/resources/messages_de_DE.properties, | |
5428 src/main/resources/messages_en.properties, | |
5429 src/main/resources/messages_de.properties: Added facet titles for | |
5430 'floodmap.hws' facets. | |
5431 | |
5432 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5433 | |
5434 * doc/conf/mapserver/dbconnection.include: Removed. DB connections are | |
5435 supported by LayerInfo objects now. So, we do not need to configure it any | |
5436 more. | |
5437 | |
5438 * doc/conf/mapserver/db_layer.vm: The database connection is provided by | |
5439 LayerInfo objects. The "INCLUDE dbconnection.include" has been replaced. | |
5440 | |
5441 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: The inner | |
5442 State class got two new methods that provide information about db | |
5443 connection string and connection type. | |
5444 | |
5445 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java, | |
5446 src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Both | |
5447 classes support getter/setter for connection and connectionType. | |
5448 | |
5449 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Fill | |
5450 LayerInfo objects used to create DB layers with the connection and | |
5451 connection type provided by WMSDBLayerFacet. | |
5452 | |
5453 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5454 | |
5455 Allow height marks with points style in w-differences diagrams. | |
5456 | |
5457 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
5458 Handle HEIGHTMARKS_POINTS facets. | |
5459 | |
5460 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5461 | |
5462 Made Q Duration curve initially inactive. | |
5463 | |
5464 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
5465 (getInitialFacetActivity): Return 0 for DURATION_Q facets. Minor | |
5466 cosmetics. | |
5467 | |
5468 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5469 | |
5470 Recommend mainvalues for Duration Curve Diagrams. | |
5471 | |
5472 * doc/conf/meta-data.xml: Recommend mainvalues for duration curve | |
5473 diagrams. refactored into macro. | |
5474 | |
5475 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5476 | |
5477 Handle MainValue Facets in Duration Curve Diagrams. | |
5478 | |
5479 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5480 Handle MainValues. | |
5481 | |
5482 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5483 Adjusted to call doAnnotations. | |
5484 | |
5485 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5486 | |
5487 Move do*Annotation* (like mainvalue) in XYChartGenerator. | |
5488 | |
5489 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
5490 (doAnnotations): New, moved from DischargeCurveGenerator. | |
5491 | |
5492 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java | |
5493 (doMainValueAnnotations): Moved to superclass. | |
5494 | |
5495 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5496 | |
5497 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
5498 Removed duplicate code. | |
5499 | |
5500 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5501 | |
5502 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
5503 (): Minor cosmetics, added stability. | |
5504 (getInitialFacetActivity): Let facets be inactive in duration curve | |
5505 diagrams. | |
5506 | |
5507 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5508 | |
5509 * doc/conf/artifacts/winfo.xml: Allow other.wqkms facets in many | |
5510 outputs, mainvalues in duration curves. | |
5511 | |
5512 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5513 | |
5514 * doc/conf/mapserver/dbconnection.include: Adapted connection params for | |
5515 using an oracle database. | |
5516 | |
5517 * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, | |
5518 src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, | |
5519 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
5520 Added Oracle support for Mapserver's DATA attribute. Oracle doesn't allow | |
5521 a "USING UNIQUE id" string in this attribute which is required by Postgis. | |
5522 | |
5523 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
5524 Modified the geometry type of "talaue.shp" from MultiPolygon to Polygon. | |
5525 | |
5526 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
5527 which returns true, if the backend uses an Oracle db instance. Otherwise, | |
5528 it returns false. | |
5529 | |
5530 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5531 | |
5532 Fix flys/issue406 (Themestyle-editor: themes for "other.wkms" and | |
5533 "other.wqkms" missing) | |
5534 | |
5535 * doc/conf/themes.xml: Fixed typos in WKms and WQKms theme names. | |
5536 | |
5537 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5538 | |
5539 Fix flys/issue405 (Datacage: Recommendations get loaded twice). | |
5540 | |
5541 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java | |
5542 (setup): Do not try/catch exception. | |
5543 (spawn_state): Generate just one "general" output. | |
5544 | |
5545 2011-11-08 Ingo Weinzierl <ingo@intevation.de> | |
5546 | |
5547 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
5548 Added a log.warn() which prints out an exception - previously it was | |
5549 just skipped. | |
5550 | |
5551 2011-11-08 Ingo Weinzierl <ingo@intevation.de> | |
5552 | |
5553 * doc/conf/meta-data.xml: Removed orphaned datacage configuration which is | |
5554 no longer loadable. | |
5555 | |
5556 2011-11-07 Ingo Weinzierl <ingo@intevation.de> | |
5557 | |
5558 * doc/conf/conf.xml: Added an "post-describe" hook which is necessary to | |
5559 load recommendations for "floodmaps". | |
5560 | |
5561 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5562 | |
5563 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java | |
5564 (loadRows, loadColumns, loadQRanges): Refactored in preparation to | |
5565 ability to create WstValueTables for given wst_id and | |
5566 column_pos (interpolation for static data). | |
5567 | |
5568 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5569 | |
5570 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
5571 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
5572 Minor, picky cosmetics. | |
5573 | |
5574 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: | |
5575 Removed junk. | |
5576 | |
5577 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5578 Added documentation. | |
5579 | |
5580 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5581 | |
5582 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5583 Be more specific in what to catch. | |
5584 | |
5585 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5586 | |
5587 * doc/conf/meta-data.xml: Added the CrossSectionTracks to the "floodmap" | |
5588 datacage configuration. | |
5589 | |
5590 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a | |
5591 FacetType "floodmap.qps". | |
5592 | |
5593 * doc/conf/conf.xml: Defined an ArtifactFactory for the "wmspqsartifact" | |
5594 string. The factory will create new instances of WMSQPSArtifact. | |
5595 | |
5596 * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java: New. This | |
5597 Artifact is used to create "floodmap.qps" facets. It has an internal fixed | |
5598 State WMSQPSState. | |
5599 | |
5600 * doc/conf/artifacts/winfo.xml: Added the "floodmap.qps" layer to the | |
5601 "floodmap" output. | |
5602 | |
5603 * doc/conf/themes.xml: Added a theme for "floodmap.qps" facets. | |
5604 | |
5605 * src/main/resources/messages.properties, | |
5606 src/main/resources/messages_de_DE.properties, | |
5607 src/main/resources/messages_en.properties, | |
5608 src/main/resources/messages_de.properties: Added strings for the QPS WMS | |
5609 layer used in floodmaps. | |
5610 | |
5611 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5612 | |
5613 Re-enable mainvalue-recommendations for computed discharge curves, | |
5614 as the NPE should be gone. | |
5615 | |
5616 * doc/conf/meta-data.xml: Uncomment mainvalue recommendations. | |
5617 | |
5618 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5619 | |
5620 When querying metadata/datacage, use only output-names of outputs that | |
5621 actually exists (in the sense of having facets). | |
5622 | |
5623 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
5624 Get output names from artifact, not from state. | |
5625 | |
5626 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5627 | |
5628 * doc/conf/meta-data.xml: Removed DEMs from floodmap configuration, | |
5629 because we are not able to draw DEMs into maps. | |
5630 | |
5631 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5632 | |
5633 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
5634 Subclasses WMSDBArtifact now and defines an inner class RiverAxisState | |
5635 which subclasses WMSDBState. | |
5636 | |
5637 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
5638 Removed. The RiverAxisState is an inner class of RiverAxisArtifact now | |
5639 which subclasses WMSDBState. | |
5640 | |
5641 * doc/conf/artifacts/riveraxis.xml: Removed, because the RiverAxisArtifact | |
5642 has a fixed static State only. | |
5643 | |
5644 * doc/conf/conf.xml: Removed riveraxis.xml definition. | |
5645 | |
5646 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5647 | |
5648 For a Flys-Collection, add outputt to attributes-part of describe | |
5649 document only if they contain facets. -> Prevent empty output nodes | |
5650 in flys-collections outputs. | |
5651 | |
5652 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
5653 (writeFacets): Added return type to indicate whether any facet was | |
5654 written. Decide whether to add an output-node depending on this | |
5655 return value. | |
5656 | |
5657 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5658 | |
5659 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Create | |
5660 line and polygon layers for barriers only if they are really existing. | |
5661 | |
5662 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5663 | |
5664 Disable mainvalue-recommendations for discharge curves as they trigger | |
5665 a yet-to-be understood NPE. | |
5666 | |
5667 * doc/conf/meta-data.xml: Comment mainvalue-recommendations for | |
5668 discharge curves. | |
5669 | |
5670 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5671 | |
5672 Added new matching condition for theme-mappings: the name of | |
5673 the output. | |
5674 | |
5675 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
5676 Added output field and function to match it against a given | |
5677 output name. | |
5678 | |
5679 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5680 Createing ThemeMapping with output attribute from configuration. | |
5681 | |
5682 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
5683 (getTheme(FLYSContext, string)): Removed, never called. | |
5684 (getTheme): Added outputName argument, match it. | |
5685 | |
5686 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5687 Pass outputs name until it can be matched against mapping. | |
5688 | |
5689 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5690 | |
5691 * doc/conf/themes.xml: Added default themes for other.w(q)kms. | |
5692 | |
5693 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5694 | |
5695 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5696 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5697 Cosmetics, reduce logging noise. | |
5698 | |
5699 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5700 | |
5701 Added access to static W_Q_Kms - data in much the same way then static | |
5702 WKms. | |
5703 | |
5704 * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: | |
5705 Cache Key for static wqkms data. | |
5706 | |
5707 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: | |
5708 Facet for WQKms. | |
5709 | |
5710 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: | |
5711 Factory to access WQKms. | |
5712 | |
5713 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
5714 Artifact that provides 'static' WQKms. | |
5715 | |
5716 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5717 Added STATIC_WQKMS type. | |
5718 | |
5719 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5720 | |
5721 * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: | |
5722 New. Maps series to zero to be compatible with XYDifferenceRenderer. | |
5723 It returns an iterator over XYDatasets to enable splitting by NaNs, | |
5724 which still needs to be implemented. | |
5725 | |
5726 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5727 Uses a XYDatasetToZeroMapper now. Fixed package name. | |
5728 | |
5729 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5730 | |
5731 Added new matching options for theme-mappings to allow more | |
5732 overspecification of defaults (e.g. now name,description-pattern and | |
5733 master-artifacts attributes are matched). The first full match from | |
5734 the configuration file is done. | |
5735 New matching option in the masterAttr- field of a mapping are | |
5736 super-basic until new use-cases come up. | |
5737 Concrete new themes are point-styles of Ws when locations where chosen | |
5738 to calculate. | |
5739 | |
5740 * doc/conf/themes.xml: Added newly defined Themes. | |
5741 | |
5742 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5743 Put master-artifact in flys-context. | |
5744 | |
5745 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
5746 Accept masterAttr in constructor. | |
5747 (masterAttrMatches): New, check masterAttr-condition against | |
5748 artifact. | |
5749 | |
5750 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5751 When creating ThemeMappings, pass in masterAttr. | |
5752 | |
5753 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
5754 (getTheme): Evaluate masterAttr-condition, always return first full | |
5755 match. | |
5756 | |
5757 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5758 | |
5759 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
5760 Added ARTIFACT key, documentation. | |
5761 | |
5762 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5763 | |
5764 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5765 New. At the moment a pure copy of JFreeChart's XYDifferenceRenderer. | |
5766 Needs to be refactored to cope with its limitations: | |
5767 | |
5768 - Series numbers need to be zero based. We have more than two series | |
5769 in our diagrams. | |
5770 | |
5771 - Cannot handle definition holes indicated by NaNs. We have these | |
5772 cases e.g. more than one "Fliessbereich". | |
5773 | |
5774 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5775 | |
5776 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5777 Reenabled dumping data to disk. | |
5778 | |
5779 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5780 | |
5781 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5782 Removed superfluous import. | |
5783 | |
5784 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5785 | |
5786 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
5787 Use new pair in stack of results and connections because they are | |
5788 always used in pairs. Maintaining two separate stacks is not | |
5789 needed any longer. | |
5790 | |
5791 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5792 | |
5793 * src/main/java/de/intevation/flys/utils/Pair.java: New. A generic pair. | |
5794 | |
5795 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5796 Rewritten to useful as test bed for "Raum/Flaeche" operations. | |
5797 | |
5798 2011-11-02 Ingo Weinzierl <ingo@intevation.de> | |
5799 | |
5800 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added | |
5801 setter methods for all parameters and removed the constructors. There is | |
5802 just an empty constructor - all parameters need to be set via setter | |
5803 methods. | |
5804 | |
5805 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified the | |
5806 creation of LayerInfo objects. | |
5807 | |
5808 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: | |
5809 Removed, because the internal structure and constructors of LayerInfo have | |
5810 changed, so that we gonna use LayerInfo for all layers now. | |
5811 | |
5812 * doc/conf/themes.xml: Modified the color definitions of | |
5813 'floodmap.riveraxis' and 'floodmap.kms' themes and added a 'symbol' field | |
5814 to 'floodmap.kms'. | |
5815 | |
5816 * doc/conf/mapserver/symbols.sym, | |
5817 doc/conf/mapserver/fontset.txt: New. Required by Mapserver. | |
5818 | |
5819 * doc/conf/mapserver/db_layer.vm: Added an 'EXTENT' field that is filled | |
5820 using LayerInfo.getExtent(). | |
5821 | |
5822 * doc/conf/mapserver/mapfile.vm: Modified FONTSET directory and added a | |
5823 SYMBOLSET. | |
5824 | |
5825 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added an | |
5826 abstract method getGeometryType(). | |
5827 | |
5828 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override | |
5829 getGeometryType() of WMSDBArtifact. This Artifact provides "POINT"s. | |
5830 | |
5831 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
5832 Create new WMSDBLayerFacets with geometry type "LINE". | |
5833 | |
5834 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
5835 Added a 'geometryType' attribute and getter/setter methods. This attribute | |
5836 determines the type of geometry provided by this database wms layer. Types | |
5837 could be "POLYGON", "POINT", "LINE" and so on. | |
5838 | |
5839 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5840 Added a 'symbol' attribute to the inner class Clazz. | |
5841 | |
5842 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a function to | |
5843 parse the symbol field of a theme. This symbol is used for | |
5844 MapserverStyle.Clazz. | |
5845 | |
5846 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5847 | |
5848 Apply point theme to heightmarks when imported in longitudinal | |
5849 section diagram. | |
5850 | |
5851 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5852 Added new FacetType HEIGHTMARK_POINTS. | |
5853 | |
5854 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
5855 Allow name to be given in constructor. | |
5856 | |
5857 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
5858 If heightmarks were loaded, give respective name in WKmsFacet | |
5859 generation. | |
5860 | |
5861 * doc/conf/themes.xml: Added virtual "Points" and concrete | |
5862 heightmark_points - theme. | |
5863 | |
5864 * doc/conf/artifacts/winfo.xml: Made longitudinal_section output | |
5865 compatible with heightmarks_points. | |
5866 | |
5867 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5868 Render heightmarks like other wkms. | |
5869 | |
5870 * doc/conf/meta-data.xml: Changed heightmark ids such that it can be | |
5871 identified in StaticWKmsFacet . | |
5872 | |
5873 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5874 | |
5875 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
5876 Documentation added. | |
5877 | |
5878 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5879 | |
5880 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
5881 Fix bug where (wrong) active-attribute was set, doc. | |
5882 | |
5883 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5884 | |
5885 Refactoring to allow mainvalues in both discharge and computed | |
5886 discharge curve diagrams. | |
5887 | |
5888 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java | |
5889 (addPointsQW): New helper function. | |
5890 | |
5891 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5892 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5893 Moved doMainValueQAnnotations, doMainValueWAnnotations from child- | |
5894 to parent-class, extracetd doDischargeOut. Use | |
5895 StyledSeriesBuilder.addPointsQW . | |
5896 | |
5897 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5898 | |
5899 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5900 Removed logger/debugging noise. | |
5901 | |
5902 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5903 | |
5904 1) Pass outputs name to artifacts getInitialFacetActivity(). | |
5905 2) Do not allow "gaps" in positions of facets in outputs in attributes | |
5906 of collection (prevent e.g. positions 1,3,5; will become 1,2,3 | |
5907 instead). | |
5908 | |
5909 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
5910 Pass outputname to artifacts getInitialFacetActivity(), prevent | |
5911 gaps in facets positions in outputs (1,3,10 become 1,2,3). | |
5912 | |
5913 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5914 | |
5915 1) Give Artifacts information about the out when they have to decide | |
5916 whether a given facet is initially in/active by adding parameter | |
5917 to getInitialFacetActivity(+outputName). | |
5918 2) Generate separate Set of MainValueFacets for discharge curves. | |
5919 | |
5920 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5921 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5922 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
5923 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
5924 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5925 (getInitialFacetActivity): Adjusted, new parameter outputName. | |
5926 Added MAINVALUES_{Q,W} definition. | |
5927 | |
5928 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
5929 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
5930 Accept name in constructor. | |
5931 | |
5932 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5933 Create second pair of MainValuesFacets, give distinguishable names. | |
5934 | |
5935 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5936 | |
5937 Added compatibility of (computed)discharge-curve diagrams with | |
5938 mainvalues. | |
5939 | |
5940 * doc/conf/artifacts/winfo.xml: Added mainvalues to compatibility list | |
5941 of (computed) discharge curve outputs. These facet-definitionss can | |
5942 differ in names because we can can have up to 4 mainvalue facets in | |
5943 one state. | |
5944 | |
5945 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
5946 | |
5947 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Determine | |
5948 the extent of such WMS layer based on the list of RiverAxisKm objects | |
5949 returned by the backend. | |
5950 | |
5951 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
5952 | |
5953 * doc/conf/meta-data.xml: Added a datacage node that represents a | |
5954 kilometer WMS layer. | |
5955 | |
5956 * doc/conf/conf.xml: Added a new Artifact WMSKmArtifact. | |
5957 | |
5958 * doc/conf/themes.xml: Added a style for 'floodmap.kms' facets. | |
5959 | |
5960 * doc/conf/artifacts/winfo.xml: Defined 'floodmap.kms' as valid floodmap | |
5961 facet. | |
5962 | |
5963 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5964 a 'floodmap.kms' facet. | |
5965 | |
5966 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method to | |
5967 determine the srid of a river based on its name. | |
5968 | |
5969 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: New. This | |
5970 Artifact should act as base Artifact for WMS layers that represent data | |
5971 from database datastore. | |
5972 | |
5973 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: New. This | |
5974 Artifact is used to generate facets for kilometer WMS layers. | |
5975 | |
5976 * src/main/resources/messages.properties, | |
5977 src/main/resources/messages_de_DE.properties, | |
5978 src/main/resources/messages_en.properties, | |
5979 src/main/resources/messages_de.properties: Added default descriptions | |
5980 for 'floodmap.kms' facets. | |
5981 | |
5982 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5983 | |
5984 Fix incompilability. | |
5985 | |
5986 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
5987 Adjust to changed CrossSectionFacet. | |
5988 | |
5989 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5990 | |
5991 Minor preparations to handle multiple cross sections in one | |
5992 diagram/artifact, faking certain aspects (e.g. ability to display | |
5993 multiple cross sections, but let these fetch the exactly same data | |
5994 for now). | |
5995 | |
5996 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5997 Parameterize but fake access to cross-section (always take first | |
5998 one). | |
5999 (getCrossSectionName,getCrossSectionNames): Renamed, access names | |
6000 of all cross-sections, so that at least facets with different names | |
6001 are created (they will still deliver the same data). | |
6002 | |
6003 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
6004 Allow indexing. | |
6005 | |
6006 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6007 Index created cross-sections. | |
6008 | |
6009 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6010 | |
6011 Show multiple water lines and facets in cross-section diagram if | |
6012 multiple waterlevel values had been entered. | |
6013 | |
6014 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
6015 (appendBackgroundActivity): Made static. | |
6016 (getWaterLines): Add 'idx' argument to specify index of queried | |
6017 waterlevel. | |
6018 | |
6019 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
6020 Add index. | |
6021 | |
6022 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6023 Add one Facet for each of the computed waterlevels. | |
6024 | |
6025 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6026 | |
6027 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
6028 Added code to calculate intersection points. | |
6029 | |
6030 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6031 Added polygons for trivial cases. WIP | |
6032 | |
6033 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6034 | |
6035 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6036 Made it compilable again. | |
6037 | |
6038 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6039 | |
6040 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
6041 Made X() and Y() access macros public. | |
6042 | |
6043 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6044 More code. WIP. | |
6045 | |
6046 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6047 | |
6048 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6049 Handle start points when building polygons. Work in progress. | |
6050 | |
6051 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6052 | |
6053 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
6054 New. Vector operations on Point2D. | |
6055 | |
6056 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6057 Moved vector operations to VectorUtils. | |
6058 | |
6059 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6060 | |
6061 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6062 Do not call size() in for loop again and again. | |
6063 | |
6064 2011-10-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6065 | |
6066 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
6067 Interim check in. Work in progress. | |
6068 | |
6069 2011-10-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6070 | |
6071 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: New. | |
6072 Polygon class to help creating "Raum/Flaeche" renderers with gaps in | |
6073 their definitions. WORK IN PROGRESS! | |
6074 | |
6075 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6076 | |
6077 * doc/conf/themes.xml: Added a default theme for the riveraxis used in the | |
6078 floodmap. | |
6079 | |
6080 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
6081 New. This class is used by ThemeUtil to create a style which is | |
6082 compatible for Mapserver- | |
6083 | |
6084 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a method to | |
6085 retrieve a Mapserver compatible style (as string) based on a given | |
6086 Document (that comes from CollectionItem's attribute). | |
6087 | |
6088 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: | |
6089 Implemented the setStyle() and getStyle() methods. | |
6090 | |
6091 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
6092 new parameter 'style' to createDatabaseLayer(). This parameter is set on | |
6093 LayerInfo. | |
6094 | |
6095 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create | |
6096 Mapserver compatible styles and call createDatabaseLayer() with this | |
6097 style. | |
6098 | |
6099 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6100 | |
6101 * doc/conf/artifacts/winfo.xml: Defined "floodmap.riveraxis" and | |
6102 "floodmap.wmsbackground" as compatible layers for the floodmap output. | |
6103 | |
6104 * doc/conf/mapserver/db_layer.vm: New. This layer template is used for | |
6105 Mapserver layers with database datastore. | |
6106 | |
6107 * doc/conf/mapserver/dbconnection.include: New. The database configuration | |
6108 used in the db_layer template. | |
6109 | |
6110 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
6111 getUserWMSUrl() that returns the URL to the user specific WMS server. | |
6112 This method requires a UUID of an Artifact to identify the owner of the | |
6113 Artifact. | |
6114 | |
6115 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Use | |
6116 FLYSUtils.getUserWMSUrl() to create the URL to the user WMS for | |
6117 WMSLayerFacets creation. | |
6118 | |
6119 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
6120 New. Subclasses WMSLayerFacet to save data and filter parameters used | |
6121 for database storage in Mapfiles. | |
6122 | |
6123 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: New. | |
6124 Subclasses LayerInfo to save database relevant parameters. | |
6125 | |
6126 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
6127 Creates new WMSDBLayerFacets, so that the riveraxis layer data is | |
6128 fetched from database. | |
6129 | |
6130 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
6131 public method that allows creating layers (type LINE) based on | |
6132 WMSDBLayerFacets. | |
6133 | |
6134 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Enabled | |
6135 support for Facets other than "floodmap.wsplgen" and "floodmap.barriers". | |
6136 Those other Facets are supposed to be WMSDBLayerFacets. | |
6137 | |
6138 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6139 | |
6140 Refactored, added StyledSeriesBuilder to unify adding points to | |
6141 XYSeries. | |
6142 | |
6143 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
6144 New class to help with adding points to XYSeries. | |
6145 | |
6146 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
6147 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6148 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6149 Use StyledSeriesBuilder to add points to series. | |
6150 | |
6151 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6152 | |
6153 Added DC-conf, such that static data can be loaded from w-difference | |
6154 diagrams datacage. | |
6155 | |
6156 * doc/conf/meta-data.xml: Minor "refactoring" (definition of two | |
6157 macros, allow certain static data to be loaded via datacage to | |
6158 w-difference diagrams, too. | |
6159 | |
6160 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6161 | |
6162 Load and display annotations in w-differences, minor polishing. | |
6163 | |
6164 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
6165 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6166 Use FacetType 'instead' of string. Allow Annotations in | |
6167 WDifferences- diagram. | |
6168 | |
6169 * doc/conf/meta-data.xml: Recommend annotations in w-differences case. | |
6170 | |
6171 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6172 | |
6173 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
6174 Survive case where a given output doesnt exist in compatibility | |
6175 matrix. | |
6176 | |
6177 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6178 | |
6179 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
6180 Added simpler constructor. | |
6181 | |
6182 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6183 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
6184 Adjusted construction of StaticStates. | |
6185 | |
6186 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6187 | |
6188 * doc/conf/artifacts/winfo.xml: Allow Annotations in longitudinal and | |
6189 w-differences diagrams. | |
6190 | |
6191 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6192 | |
6193 Use artifacts configuration (e.g. winfo.xml) to define which facets | |
6194 can be used in which output. Hide no-matches. | |
6195 | |
6196 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
6197 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6198 Added use of "compatibility matrix". Only include facets in in | |
6199 collections description document that are marked compatible in the | |
6200 masterartifacts configuration (e.g. winfo.xml). | |
6201 | |
6202 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6203 | |
6204 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
6205 (mergeAttributes, getMasterArtifact): Extraced, updated caller. | |
6206 Cosmetics to reduce indentation one step. | |
6207 | |
6208 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6209 | |
6210 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java | |
6211 (getStateHistoryIds): New, return list of current and all previous | |
6212 state ids. | |
6213 | |
6214 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6215 | |
6216 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
6217 Trigger the re-creation of FLYS mapfile if endOfLife() of this state is | |
6218 called. | |
6219 | |
6220 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6221 | |
6222 * doc/conf/mapserver/mapfile.vm: The "layers" injected by VelocityEngine is | |
6223 now used to include layers. A single string in this list represents the | |
6224 path to a file which contains a LAYER section for Mapserver' Mapfile. | |
6225 | |
6226 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Removed the | |
6227 update() call of MapfileGenerator. Mapfiles are generated by MapGenerator | |
6228 only which requires a FLYSArtifactCollection.doOut()! | |
6229 | |
6230 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Call update() | |
6231 of MapfileGenerator to trigger the re-creation of mapfile(s). | |
6232 | |
6233 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Collect all | |
6234 LAYER snippets from filesystem and inject the filepath for each snippet | |
6235 into the Mapfile template. | |
6236 | |
6237 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6238 | |
6239 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
6240 src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java, | |
6241 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6242 Cosmetics, doc. | |
6243 | |
6244 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6245 | |
6246 Let OutputParser and AttributeParser collect all facets on the way. | |
6247 | |
6248 * src/main/java/de/intevation/flys/collections/OutputParser.java, | |
6249 src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
6250 Collect all facets while iterating over Outputs and Attributes, | |
6251 documentation added. | |
6252 | |
6253 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6254 | |
6255 Extracted getFlysContext from FLYSArtifacts into FLYSUtils. | |
6256 | |
6257 * src/main/java/de/intevation/flys/utils/FLYSUtils.java | |
6258 (getFlysContext): Added, extracted from FLYSArtifact. | |
6259 | |
6260 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6261 (getFlysContext): Moved to FLYSUtils, updated callers. | |
6262 | |
6263 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
6264 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6265 Update callers to getFlysContext. | |
6266 | |
6267 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6268 | |
6269 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: | |
6270 Catch IOException - flys-artifacts compiles again. | |
6271 | |
6272 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6273 | |
6274 * doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet | |
6275 for floodmaps. | |
6276 | |
6277 * doc/conf/mapserver/shapefile_layer.vm: New. Currently a copy of | |
6278 layer.vm. This template will evolve to a special mapserver layer | |
6279 template with a shapefile data source. | |
6280 | |
6281 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Fixed broken | |
6282 facet name of barriers. | |
6283 | |
6284 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added | |
6285 public methods for creating wsplgen and barriers layer files for | |
6286 mapserver. | |
6287 | |
6288 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Use | |
6289 MapfileGenerator to create new layer files for wsplgen and barriers. | |
6290 | |
6291 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
6292 | |
6293 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new | |
6294 method gerRiverBoundary() which returns an Envelope object (which | |
6295 represents the bounding box of a Geometry) of a riveraxis specified by its | |
6296 rivername. | |
6297 | |
6298 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: Use | |
6299 Geometry.getRiverBoundary() to determine the max extent of a river. | |
6300 | |
6301 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, | |
6302 src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Use | |
6303 JTS Envelope to save the bounding boxes of WMS layers. | |
6304 | |
6305 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
6306 Adapted the code to apply the changes in GeometryUtils (use Envelope to | |
6307 determine the max extent of the river axis). | |
6308 | |
6309 * src/main/java/de/intevation/flys/exports/MapGenerator.java: New (work in | |
6310 progress). This Generator will currently return a map configuration in XML | |
6311 which consists of parameters required by OpenLayers to create a map. | |
6312 | |
6313 * doc/conf/conf.xml: Registered the new MapGenerator. | |
6314 | |
6315 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6316 | |
6317 * doc/conf/meta-data.xml: Do not recommend historical data to load | |
6318 when having computational discharge curves. | |
6319 | |
6320 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6321 | |
6322 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6323 Reduce noise, given "error" message was more of "debug" nature. | |
6324 | |
6325 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6326 | |
6327 Restore mapping of state id to facets (essentially revert, revision | |
6328 3083 and 3088). | |
6329 | |
6330 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6331 (getInitialFacetActivity): Be more explicit on which facets to | |
6332 introduce inactivated. | |
6333 | |
6334 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6335 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
6336 Minor refactoring, declare a string final static. | |
6337 | |
6338 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
6339 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
6340 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6341 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
6342 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
6343 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
6344 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
6345 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
6346 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6347 Restore association from state id to facets. | |
6348 | |
6349 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6350 | |
6351 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
6352 src/main/java/de/intevation/flys/collections/OutputParser.java: | |
6353 Cosmetics, documentation. | |
6354 | |
6355 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6356 | |
6357 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6358 Prepare rendering of "other/static wkms" (functional) and | |
6359 w-differences (not yet fully functional). | |
6360 | |
6361 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6362 | |
6363 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
6364 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
6365 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
6366 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6367 Cosmetics. | |
6368 | |
6369 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6370 | |
6371 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
6372 Do not store facets in a map from stateId to list of facets, but in | |
6373 a pure list instead. | |
6374 | |
6375 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6376 | |
6377 * doc/conf/artifacts/winfo.xml: Adjusted to newer semantics, | |
6378 minor cleanups. | |
6379 | |
6380 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6381 | |
6382 Resolve association of facets to states in artifacts. This eases | |
6383 merging of outputs and facets and inhibition of unwanted outputs | |
6384 substiantially (at the price of slightly more expensive merging). | |
6385 Also, the semantics of artifacts configuration files (e.g. winfo.xml) | |
6386 is changed (facet elements within an output elements are used for | |
6387 merging). | |
6388 | |
6389 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
6390 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
6391 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6392 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
6393 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
6394 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
6395 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
6396 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6397 Do not store facets in a map from stateId to list of facets, but in | |
6398 a pure list instead. | |
6399 | |
6400 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6401 | |
6402 * doc/conf/meta-data.xml: Added dc configuration for some data | |
6403 that can be loaded from longitudinal section diagrams. | |
6404 | |
6405 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6406 | |
6407 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6408 Cosmetics, docs. | |
6409 | |
6410 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6411 | |
6412 Let Qs in Longitudinal Diagram be inactive, initally. | |
6413 | |
6414 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6415 (getInitialFacetActivity): Do not let Facets ending with a 'q' | |
6416 enter in active state. | |
6417 | |
6418 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6419 | |
6420 * doc/conf/meta-data.xml: Fix broken datacage config. | |
6421 | |
6422 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6423 | |
6424 * doc/conf/meta-data.xml: Configured to include correct id to | |
6425 clone artifact that produces w-diff. | |
6426 | |
6427 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6428 | |
6429 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6430 Revert correct behaviour of Annotations (the small axis tick shall | |
6431 always be drawn). Minor refactoring. | |
6432 | |
6433 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6434 | |
6435 * doc/conf/meta-data.xml: Added configuration to include differences | |
6436 in datacage when longitudinal sections are shown (yet not | |
6437 functional). | |
6438 | |
6439 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6440 | |
6441 * doc/conf/meta-data.xml: Cosmetics. | |
6442 | |
6443 2011-10-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6444 | |
6445 * doc/conf/themes.xml: Added theme for w_differences facets. | |
6446 | |
6447 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java | |
6448 (createSecondAxisRange): Survive parameter-nullness for now. | |
6449 Added documentation. | |
6450 | |
6451 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6452 | |
6453 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
6454 New. Caching wrapper around an XML document theme. It uses ThemeUtil | |
6455 to access the values and stores them in instance variable. | |
6456 Background: ThemeUtil use XPath a lot which is expensive. | |
6457 | |
6458 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java, | |
6459 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6460 Use ThemeAccess to style the annotations. | |
6461 | |
6462 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6463 Removed some XPath strings. They are in ThemeUtil. | |
6464 | |
6465 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6466 | |
6467 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6468 Added methods to parse further attributes. | |
6469 | |
6470 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6471 Apply the theme attributes and use ThemeUtils to get the attribute values. | |
6472 | |
6473 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6474 Removed the spamy debug output. | |
6475 | |
6476 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6477 | |
6478 To obtain the size of a diagram it is rendered twice. The | |
6479 second time the generated image is omitted so the concrete | |
6480 rendered image is not needed. To save CPU cycles in this pass | |
6481 the image is rendered to to /dev/null Graphics2D object. | |
6482 | |
6483 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
6484 Added boolean system property "info.rendering.nop.graphics" (default: false). | |
6485 With this property set the info rendering is done via a new | |
6486 NOPGraphics2D opbject which does not render the image. | |
6487 | |
6488 * src/main/java/de/intevation/flys/java2d/NOPGraphics2D.java: | |
6489 New. Implements java.awt.Graphics2D trivial empty methods. | |
6490 This prevents rendering. | |
6491 | |
6492 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6493 Commented out spamy debug output | |
6494 | |
6495 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6496 | |
6497 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6498 Draw the text background and use orientation attribute. | |
6499 | |
6500 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6501 | |
6502 * doc/conf/themes.xml: | |
6503 Renamed 'textbackground' to 'backgroundcolor' to have 'color' in the | |
6504 attribute name. | |
6505 | |
6506 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6507 Process text attributes correctly. | |
6508 | |
6509 2011-10-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6510 | |
6511 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
6512 New. Service to lookup the Nth nearest neighbors for a set of given | |
6513 cross section ids and kms. | |
6514 | |
6515 * doc/conf/conf.xml: Registered service. | |
6516 | |
6517 * doc/conf/cache.xml: Cache config. | |
6518 | |
6519 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6520 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6521 Removed superfluous imports. | |
6522 | |
6523 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
6524 | |
6525 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6526 Added methods to extract further attributes from theme. | |
6527 | |
6528 2011-10-20 Ingo Weinzierl <ingo@intevation.de> | |
6529 | |
6530 * doc/conf/themes.xml: Added main value themes for longitudinal section | |
6531 charts. | |
6532 | |
6533 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: New. This | |
6534 class stores the name of a facet, the related theme and a pattern | |
6535 string. | |
6536 | |
6537 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
6538 Read the pattern string and store a list of ThemeMapping objects in the | |
6539 FLYSContext. | |
6540 | |
6541 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Modified | |
6542 getTheme() which now takes the FLYSContext, the name of a facet and an | |
6543 optional pattern string. Now, we can have specialized Themes for each | |
6544 chart type. E.g. the facet "longitudinal_section.w" maps the default | |
6545 Theme for W lines in longitudinal section charts. If the optional | |
6546 pattern string matches the pattern ".*(HQ1000)(\D.*)*", the ThemeFactory | |
6547 will return the Theme "LongitudinalSectionW_HQ1000". | |
6548 | |
6549 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6550 Use the description of a facet as pattern string to get the relevant | |
6551 Theme from ThemeFactory. | |
6552 | |
6553 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
6554 | |
6555 * doc/conf/themes.xml: | |
6556 Added new theme attributes. | |
6557 | |
6558 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6559 | |
6560 Fix WDifference plots where masterartifact has no range set. | |
6561 | |
6562 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6563 (addSubtitles): Overridden, the master artifact has no | |
6564 range. | |
6565 | |
6566 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6567 | |
6568 Fix masterartifact in collections in cases where the original | |
6569 masterartifacts facets do not come first in certain list. Query | |
6570 'backend'/db instead. | |
6571 | |
6572 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6573 Set 'real' master artifact, defined to be oldest belonging to this | |
6574 collection. | |
6575 | |
6576 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6577 | |
6578 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
6579 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
6580 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
6581 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6582 Modified the method signature of createStaticData() which now also | |
6583 requires a FLYSArtifact. | |
6584 | |
6585 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
6586 Override createStaticData() to create titles for Qs manually - we want | |
6587 to display the named main values if existing for the selected Qs. | |
6588 | |
6589 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
6590 | |
6591 * doc/conf/themes.xml: | |
6592 ComputedDischargeCurveW and ComputedDischargeCurveQ inherit attributes from | |
6593 theme 'Text'. | |
6594 | |
6595 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6596 | |
6597 Fix for flys/issue316 | |
6598 | |
6599 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added | |
6600 constructor to not sort the data. | |
6601 | |
6602 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
6603 Use the not sorting constructor of StyledXYSeries. | |
6604 | |
6605 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6606 | |
6607 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6608 moved the code to create WSP W and Q facet names to FLYSUtils. | |
6609 | |
6610 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New functions for | |
6611 creating WSP W and Q facet names and for querying a named main value | |
6612 based on a given gauge and value. The names of W and Q facets will now | |
6613 depend on the selected Q and Q mode: if the mode is "q at gauge" and a | |
6614 named value is found for the given value, the facet's name contains the | |
6615 named value instead of the value itself. | |
6616 | |
6617 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6618 | |
6619 Fix datacage configuration to let client load ZUS and flood | |
6620 protections. | |
6621 | |
6622 * doc/conf/meta-data.xml: Use 'ids' instead of 'id' to help client. | |
6623 | |
6624 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
6625 | |
6626 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6627 Added methods to parse text attributes from theme document. | |
6628 | |
6629 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
6630 src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6631 Apply a theme to axis annotations. | |
6632 | |
6633 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6634 | |
6635 Create (data) Label from data string (client will be adjusted to send | |
6636 the name). | |
6637 | |
6638 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6639 Create label from input data string, documentation added, junk | |
6640 removed. | |
6641 | |
6642 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6643 | |
6644 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java(zoom): | |
6645 Do not crash if no axis is given. | |
6646 | |
6647 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6648 | |
6649 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added | |
6650 getFormat() which extracts the format string from XML request document. | |
6651 | |
6652 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: Adapted | |
6653 method signatures of exportImage(), exportSVG() and exportPDF(). All | |
6654 methods now take a CallContext object which stores extra chart export | |
6655 parameters. | |
6656 | |
6657 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6658 Enabled PDF and SVG chart exports based on the "format" string given in | |
6659 the XML request document. | |
6660 | |
6661 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6662 | |
6663 Simplify rendereing W(Q)Kms in WDifferencesCurveGenerator. | |
6664 | |
6665 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6666 (doWOut, doWOut): Simplified. | |
6667 | |
6668 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6669 | |
6670 Render zus and flood-protections in WDifferences-diagrams. | |
6671 | |
6672 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6673 Added basic respect of "other.wkms"- facets. | |
6674 | |
6675 | |
6676 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6677 | |
6678 Adjusted Datacage-Configuration to fetch "extra longitudinal...." | |
6679 (.zus) - waterlevels in certain case (in system-part). | |
6680 | |
6681 * doc/conf/meta-data.xml: Adjusted to present extra-kms with | |
6682 staticwkms factory in certain case. | |
6683 | |
6684 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
6685 | |
6686 * doc/conf/themes.xml: | |
6687 Added new virtual theme for text with the attributes 'font', 'textcolor' | |
6688 and 'textsize'. | |
6689 | |
6690 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6691 | |
6692 Give StaticWKmsArtifacts proper names, and pre-deselect them. | |
6693 | |
6694 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6695 (getInitialFacetActivity): Overridden to let facets enter plot | |
6696 inactively. | |
6697 (setup): Give Facets the name of the Wst. | |
6698 | |
6699 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6700 Refactored to expose getWKmsName separately. | |
6701 | |
6702 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6703 | |
6704 Adjusted Datacage-Configuration to fetch flood-protections when | |
6705 waterlevels are requested (in system-part). | |
6706 | |
6707 * doc/conf/meta-data.xml: Adjusted to present flood-protections with | |
6708 staticwkms factory in certain case. | |
6709 | |
6710 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6711 | |
6712 Register staticwkms factory. | |
6713 | |
6714 * doc/conf/conf.xml: Register staticwkms factory to spawn StaticWKms- | |
6715 Artifacts. | |
6716 | |
6717 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6718 | |
6719 Fetch name of static WKms. | |
6720 | |
6721 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6722 Removed dependence on "kind", but fetch name for created WKms. | |
6723 | |
6724 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6725 Remove dependence on Kind. | |
6726 | |
6727 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6728 | |
6729 Store parameterization in data, not in Artifact. | |
6730 | |
6731 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6732 Resolve col_pos and wst_id field, use data instead. | |
6733 | |
6734 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6735 | |
6736 Add convenience-method to add defaultdata (string). | |
6737 | |
6738 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6739 (addStringData): Add Default (String) Data . | |
6740 | |
6741 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6742 | |
6743 Add a new Artifact and Facet (StaticWKmsArtifact, WKmsFacet) to | |
6744 access WKms obtainable with the WKmsFactory. | |
6745 | |
6746 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6747 New, artifact with single state to get WKms from WKmsFactory. | |
6748 | |
6749 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
6750 New Facet to display W over km. | |
6751 | |
6752 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
6753 Added new type name. | |
6754 | |
6755 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6756 | |
6757 Add WKMsFactory to access 'static' wst-data. | |
6758 | |
6759 * src/main/java/de/intevation/flys/artifacts/model/StaticWKmsCacheKey.java: | |
6760 Cache Key for the static WKms data. | |
6761 | |
6762 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6763 New, creates WKms from wst-id and column. Does not yet fetch the | |
6764 name. | |
6765 | |
6766 * doc/conf/cache.xml: Added cache configuration for static wkms data. | |
6767 | |
6768 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6769 | |
6770 Cosmetics, docs. | |
6771 | |
6772 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
6773 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
6774 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
6775 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6776 src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
6777 Cosmetics, docs. | |
6778 | |
6779 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6780 | |
6781 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
6782 Added constructor that takes name, docs. | |
6783 | |
6784 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6785 | |
6786 Fix issue that Annotations do not come with theme/style. | |
6787 | |
6788 * doc/conf/themes.xml: Added "Annotations" default style. | |
6789 | |
6790 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6791 Set style of annotations, minor cosmetics. | |
6792 | |
6793 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6794 | |
6795 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6796 Made inner class ThemeList static. | |
6797 s/new Integer(small)/Integer.valueOf(small)/ | |
6798 | |
6799 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6800 | |
6801 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6802 The inner class ThemeList makes now use of ManagedDomFacet to read the | |
6803 attributes of Facets saved in the Collection's attribute. | |
6804 | |
6805 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6806 | |
6807 flys/issue314: Variables in datacage are now case insensitive. | |
6808 (H2 returns meta data variables uppercase) | |
6809 | |
6810 * doc/conf/meta-data.xml: | |
6811 Made a statement more precise. Added some debug output. | |
6812 | |
6813 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
6814 Use uppercase variable names. | |
6815 | |
6816 * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, | |
6817 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
6818 src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, | |
6819 src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
6820 Variables are now treated as uppercase. | |
6821 | |
6822 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
6823 Input variables are now treated uppercase. | |
6824 | |
6825 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6826 | |
6827 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
6828 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
6829 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
6830 Prepared Facets to support a "visible" attribute. | |
6831 | |
6832 * src/main/java/de/intevation/flys/collections/OutputParser.java: Adapted | |
6833 the constructor call of ManagedFacetAdapter. | |
6834 | |
6835 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6836 The inner class ThemeList now supports the "visible" attribute of | |
6837 ManagedFacets. | |
6838 | |
6839 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
6840 | |
6841 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6842 Added method to apply line type. | |
6843 | |
6844 * doc/conf/themes.xml: | |
6845 Changed initial default value for line type. | |
6846 | |
6847 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6848 | |
6849 flys/issue226 (W-INFO: Dauerlinienberechung /Abbbildung x-Achse) | |
6850 | |
6851 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
6852 Set the upper bound of these charts to 364. | |
6853 | |
6854 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6855 | |
6856 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
6857 Added a function that returns a Gauge based on its name. | |
6858 | |
6859 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
6860 Create proper descriptions for facets. | |
6861 | |
6862 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Added a | |
6863 setter for labels. | |
6864 | |
6865 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
6866 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
6867 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6868 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6869 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
6870 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6871 Use the string returned by Facet.getDescription() as series names. The | |
6872 ThemePanel and the Legend will always display the same titles for curves | |
6873 now. | |
6874 | |
6875 | |
6876 2011-10-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6877 | |
6878 Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). | |
6879 | |
6880 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6881 (parseLineWidth): New. Get line width from Document. | |
6882 | |
6883 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6884 When adding annotations, parse line width from theme, set it. | |
6885 | |
6886 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6887 When painting, set Paint and stroke early enough. | |
6888 | |
6889 2011-10-14 Ingo Weinzierl <ingo@intevation.de> | |
6890 | |
6891 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Put the | |
6892 config directory into the Velocity context. It is available as | |
6893 '$CONFIGDIR' in templates. | |
6894 | |
6895 * doc/conf/mapserver/mapfile.vm: Set the debug file to | |
6896 "$CONFIGDIR/flys-user-wms.log" and added a LEGEND section. | |
6897 | |
6898 * doc/conf/mapserver/wsplgen_class.vm: Adapted the class names. Those | |
6899 names are displayed in the image served by GetLegendGraphic. | |
6900 | |
6901 2011-10-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6902 | |
6903 Add possibility of programmatic configuration of initial "activity" | |
6904 state (active or inactive) of (Managed)Facets by introducing | |
6905 FLYSArtifact.getInitialFacetActivity. This method shall be overriden | |
6906 by subclasses where Facets are wanted to come to live inactive. | |
6907 Artifacts will be asked only once how the MangedFacet should come to live, | |
6908 namely when AttributeWriter finds a genuinely new Facet. | |
6909 | |
6910 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
6911 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java | |
6912 (getInitialFacetActivity): | |
6913 New function to let Artifact decide whether a ManagedFacet shall | |
6914 initially be set to active or inactive. | |
6915 | |
6916 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
6917 Accept database in constructor. For genuinely new Facets, spawn its | |
6918 mother artifact and ask whether the (Managed)Facet shall be active | |
6919 or inactive (initially). | |
6920 | |
6921 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
6922 (buildOutAttributes): Pass database to AttributeWrite (which needs it | |
6923 to spawn artifacts), rename items parameter to reflect content. | |
6924 | |
6925 2011-10-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6926 | |
6927 Cosmetics, removed obsolete imports. | |
6928 | |
6929 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
6930 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6931 Removed obsolete imports. | |
6932 | |
6933 2011-10-12 Ingo Weinzierl <ingo@intevation.de> | |
6934 | |
6935 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
6936 Added a further attribute "mark.selected" to the barriers feature type. | |
6937 This attribute is used in the client, where we are not able to remove it | |
6938 properly. Reading the GeoJSON string without this attribute is no longer | |
6939 possible... strange! | |
6940 | |
6941 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6942 | |
6943 Added i18n for label of wdiff "pair select" states data. | |
6944 | |
6945 * src/main/resources/messages.properties, | |
6946 src/main/resources/messages_de_DE.properties, | |
6947 src/main/resources/messages_en.properties, | |
6948 src/main/resources/messages_de.properties: Added i18n for | |
6949 state.winfo.waterlevel_pair_select . | |
6950 | |
6951 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6952 | |
6953 Addressed "Wrong labels" [6] part of flys/issue371 (W-INFO / Differenzen: | |
6954 Anmerkungen zur Umsetzung) . | |
6955 | |
6956 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
6957 Adjusted variable names to avoid conflict in subclasses, adjusted | |
6958 default value for i18n string. | |
6959 | |
6960 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6961 | |
6962 Cosmetics, docs. | |
6963 | |
6964 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6965 Cosmetics: Space after full stop in commments, slightly improved | |
6966 documentation, added one debug message. | |
6967 | |
6968 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6969 | |
6970 Fix remainder of flys/issue304 (Erweiterte Funktionen W-Differenzen) . | |
6971 | |
6972 * doc/conf/artifacts/winfo.xml: Removed obsolete data of | |
6973 WDifferencesState. | |
6974 | |
6975 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
6976 Re-enable facet-filtering, but adjust filters before that happens | |
6977 (former longitudinal_section output is now w_differences output). | |
6978 | |
6979 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6980 | |
6981 Added wdiff-chart translations. | |
6982 | |
6983 * src/main/resources/messages.properties, | |
6984 src/main/resources/messages_de_DE.properties, | |
6985 src/main/resources/messages_en.properties, | |
6986 src/main/resources/messages_de.properties: Added i18n for wdiff. | |
6987 | |
6988 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6989 | |
6990 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6991 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6992 Expose translateable Strings as constants. | |
6993 | |
6994 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6995 | |
6996 Fix most labels in w-differences charts. | |
6997 | |
6998 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6999 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7000 Remove most static final i18n-variables in favor of direct String | |
7001 usage or usage of methods. By this, allow easier adoption of labels | |
7002 in subclasses. | |
7003 | |
7004 2011-10-11 Ingo Weinzierl <ingo@intevation.de> | |
7005 | |
7006 flys/issue383 (Zweite Y-Achse wird beim Zoomen/Verschieben nicht angepasst.) | |
7007 | |
7008 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7009 Call adjustAxes() before applying zoom settings with autoZoom(). We need | |
7010 to add new y-axes first before we adjust their ranges. | |
7011 | |
7012 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7013 | |
7014 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7015 s/new Integer(small)/Integer.valueOf(small)/ | |
7016 | |
7017 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7018 | |
7019 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
7020 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7021 Do not fire change events for each and every data point added. | |
7022 | |
7023 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7024 | |
7025 Fix WDifferences with more than one Pair (crashed due to incorrect index for | |
7026 facets.) | |
7027 | |
7028 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7029 Fix wrong index for difference facets (allows for more than one | |
7030 difference facet per artifact without crashes). | |
7031 | |
7032 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7033 | |
7034 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7035 Use slightly modified doWOut-implementation from | |
7036 LongitudinalSectionGenerator (here need to add Ws to different axis). | |
7037 | |
7038 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7039 | |
7040 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7041 Fix import/reference. | |
7042 | |
7043 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7044 | |
7045 Let WaterlevelPairSelectState include diffids-data (if any) to enable | |
7046 future work on repopulation of Grid in GUI when jumping back | |
7047 (reparameterization). | |
7048 | |
7049 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7050 (createItems): Override to include old data. | |
7051 | |
7052 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
7053 | |
7054 flys/issue150 (Diagramm: Anzeige von W bergauf) | |
7055 flys/issue345 (W-INFO / Wasserspiegellagenberechnung, Diagrammausgabe) | |
7056 | |
7057 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7058 Corrected the determination to invert the x axis, so that waterlines | |
7059 will start with their highest value at the left and end with their | |
7060 lowest values at the right. | |
7061 | |
7062 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7063 | |
7064 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
7065 Cosmetics, added an (@Override) annotation. | |
7066 | |
7067 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java, | |
7068 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7069 Cosmetics, added documentation. | |
7070 | |
7071 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
7072 Cosmetics, whitespace after full stops in comments, added | |
7073 (@Override) annotation. | |
7074 | |
7075 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
7076 | |
7077 flys/issue220 (Diagramm: Achsenbeschriftungen an verschiedenen Achsen müssen gleich aussehen) | |
7078 | |
7079 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
7080 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7081 Adjusted the label font of the 2nd y-axis - now, both axes labels look | |
7082 equal. | |
7083 | |
7084 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
7085 | |
7086 flys/issue189 (WINFO/Dauerlinie: Sortierung der Berechnungsausgabe nach Dauerzahlen aufsteigend) | |
7087 | |
7088 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: Added a | |
7089 method that determines if the items (days) in this object are increasing | |
7090 or not. | |
7091 | |
7092 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
7093 Changed the order of the CSV export - the highest day is at the top of | |
7094 the export; the lowest day is at the bottom. | |
7095 | |
7096 2011-10-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7097 | |
7098 Worked on flys/issue150 (Diagramm: Anzeige von W bergauf). | |
7099 Still does not work in all cases. | |
7100 | |
7101 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java (generateChart()): | |
7102 Reordered calls to ensure that the inversion of the x axis is | |
7103 not eliminated by other chart generation steps as a side effect. | |
7104 | |
7105 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7106 Assuming that JFreeChart is inverting axis automatically if the | |
7107 KMs are reversed ordered only do invert only in some situations. | |
7108 | |
7109 Do not invert axis for Q (@Ingo: This is wrong! We must do this | |
7110 if we are only displaying the Qs and the Ws are deactived). | |
7111 | |
7112 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
7113 | |
7114 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7115 Take care on empty ranges while preparing ranges for single points. | |
7116 | |
7117 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
7118 | |
7119 flys/issue114 (W-INFO: Wasserspiegellagenberechnung / Ort (Spezialfall: Generierung eines Diagramms bei punkthafter Berechnung)) | |
7120 | |
7121 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Expand | |
7122 ranges for x and y axes if there is just a single point in a series - | |
7123 JFreeChart requires a range where lower <> upper. | |
7124 | |
7125 2011-10-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7126 | |
7127 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
7128 src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java, | |
7129 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
7130 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7131 Add whitespace after full stop in comments, minor doc improvements. | |
7132 | |
7133 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
7134 | |
7135 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
7136 | |
7137 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7138 Adapted the process of collecting outs for Artifacts/Facets. We will now | |
7139 call OutGenerator.doOut() for each Artifact and Facet - never mind if | |
7140 the facet is activated (visible) or not. The OutGenerator should decide | |
7141 on its own whtat to do with facets which are "marked" as _not_ visible. | |
7142 | |
7143 * src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
7144 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
7145 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
7146 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
7147 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
7148 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
7149 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
7150 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
7151 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
7152 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
7153 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
7154 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
7155 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
7156 Adapted the signature of OutGenerator.doOut(). There will be a new | |
7157 boolean parameter "visible" that determines if the facet specified in | |
7158 this method is visible for this output or not. | |
7159 | |
7160 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Now, | |
7161 that we walk over every Artifact/Facet, we are able to collect min/max | |
7162 data for all axes. We store these information and use them to set the | |
7163 ranges of x and y axes. The result of this: a chart can have proper axes | |
7164 set without any data in it. | |
7165 | |
7166 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Use | |
7167 min/max ranges stored while calling doOut() for each Artifact/Facet | |
7168 instead of fetching those information from chart's Datasets (which could | |
7169 be null). | |
7170 | |
7171 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
7172 | |
7173 * src/main/java/de/intevation/flys/utils/Formatter.java: Changed the max | |
7174 number of digits for AT exports from 0 to 2. | |
7175 | |
7176 2011-10-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7177 | |
7178 * src/main/java/de/intevation/flys/exports/ATWriter.java: Get rid | |
7179 of buggy first line code. | |
7180 | |
7181 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7182 | |
7183 fixed flys/issue201 | |
7184 | |
7185 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7186 Replace >= with > in km index lookup because last km was not found. | |
7187 | |
7188 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7189 | |
7190 fixed flys/issue177 | |
7191 | |
7192 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
7193 Revert rev2245. Code works fine now! :-) | |
7194 | |
7195 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
7196 | |
7197 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Stores a | |
7198 list of XYTextAnnotations instead of FLYS specific Annotations. This | |
7199 makes this class suitable for other annotation types as well. | |
7200 | |
7201 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
7202 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
7203 Both facets' getData() will now return an instance of FLYSAnnotation. | |
7204 | |
7205 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
7206 Create XYTextAnnotations used to instantiate an object of | |
7207 FLYSAnnotation. | |
7208 | |
7209 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
7210 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7211 Removed the code to add annotations to the plot. This task is general | |
7212 enough to move this code to parent class. | |
7213 | |
7214 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7215 Instances of this class are now able to store - besides first and second | |
7216 axes datasets - a list of annotations. This annotations are added to the | |
7217 plot after the datasets have been added. To support LegendItems for | |
7218 those annotions, it was necessary to create a the LegendItemCollection | |
7219 by ourself. This work is done while applying the themes for each series | |
7220 in the chart. | |
7221 | |
7222 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7223 | |
7224 Removed code duplication of guessWaterIncreasing() | |
7225 | |
7226 * src/main/java/de/intevation/flys/artifacts/model/WKms.java(allKms, allWs): | |
7227 Added methods to fetch all kms and all ws. | |
7228 | |
7229 * src/main/java/de/intevation/flys/utils/DataUtil.java: Generalized to | |
7230 get WKms as arguments. | |
7231 | |
7232 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
7233 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
7234 src/main/java/de/intevation/flys/artifacts/model/WQ.java: Implements | |
7235 the extended WKms interface. | |
7236 | |
7237 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7238 Uses the generalized DataUtil.guessWaterIncreasing(). | |
7239 | |
7240 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
7241 | |
7242 flys/issue347 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
7243 flys/issue303 (Keine Streckenfavoriten, wenn nur Q im Längsschnittdiagram ausgewählt) | |
7244 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
7245 | |
7246 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: New. A | |
7247 wrapper for Annotations which allows us to provide a description for a | |
7248 set of annotations. | |
7249 | |
7250 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
7251 The getData() will now return an instance of FLYSAnnotation that wraps | |
7252 the Annotations returned by the AnnotationArtifact. The lebel of | |
7253 FLYSAnnotation is the description of this Facet. | |
7254 | |
7255 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7256 Modified the way to add Annotations. We will no longer create an empty | |
7257 series to support a LegendItem for a set of Annotations, but we will add | |
7258 a LegendItem manually to the LegendItemCollection of the plot. In | |
7259 addition, we are now able to display annotations if one of the two | |
7260 y-axes are missing. If there are no y-axes existing, we are not able to | |
7261 display annotations yet. | |
7262 | |
7263 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7264 | |
7265 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
7266 Lifted the wrong point. Now all backjump corrections look fine. :-) | |
7267 | |
7268 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
7269 | |
7270 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
7271 Fixed bugs and make use of a cache for annotations now. | |
7272 | |
7273 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7274 | |
7275 Worked on flys/issue31 | |
7276 | |
7277 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
7278 Simplified the code a lot. Needs testing. Maybe flys/issue31 is gone | |
7279 | |
7280 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
7281 | |
7282 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7283 Fetch the WstUnit value from river - the Wst itself no longer supports a | |
7284 Unit iself. | |
7285 | |
7286 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7287 | |
7288 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, | |
7289 src/main/java/de/intevation/flys/utils/DoubleUtil.java: Moved some generic | |
7290 double array code to DoubleUtil. | |
7291 | |
7292 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7293 | |
7294 * src/main/java/de/intevation/flys/utils/DoubleUtil.java (interpolateSorted): | |
7295 Added code to linear interpolate double values in a sorted array. | |
7296 Keys and values are given as double arrays. Keys need to be sorted. | |
7297 | |
7298 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7299 | |
7300 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7301 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7302 Removed superfluous imports. | |
7303 | |
7304 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
7305 | |
7306 flys/issue330 (Dauerlinie kann nicht berechnet werden) | |
7307 | |
7308 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
7309 Add a problem if no data was found for duration curves. | |
7310 | |
7311 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
7312 | |
7313 * src/main/java/de/intevation/flys/themes/Theme.java, | |
7314 src/main/java/de/intevation/flys/themes/DefaultTheme.java: Added | |
7315 getter/setter methods to provide a facet (string) and index (int). Both | |
7316 values are written as attribute to the Theme's XML representation. | |
7317 | |
7318 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7319 Set the "facet" and "index" values of themes. | |
7320 | |
7321 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
7322 | |
7323 flys/issue346 (W-INFO / Anzeige der Höheninformation) | |
7324 | |
7325 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7326 Modified x and y axis title. The x axis title is now "RIVERNAME-km"; the | |
7327 y axis title is now "W[WST_UNIT]" where WST_UNIT depends on the unit of | |
7328 the WST. | |
7329 | |
7330 * src/main/resources/messages.properties, | |
7331 src/main/resources/messages_de_DE.properties, | |
7332 src/main/resources/messages_en.properties, | |
7333 src/main/resources/messages_de.properties: Modified i18n expressions for | |
7334 x and y axis of longitudinal section charts. | |
7335 | |
7336 2011-09-30 Ingo Weinzierl <ingo@intevation.de> | |
7337 | |
7338 flys/issue351 (W-INFO / Wasserspiegellagenberechnungen) | |
7339 | |
7340 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: Modified the | |
7341 explode() function that returns a list of values specified by min, max | |
7342 and an interval. If the last value, determined by the interval, is | |
7343 bigger than the max value, it is not included in the result list. | |
7344 | |
7345 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7346 | |
7347 flys/issue334 (Querprofil-Diagramm: Ausgabe dieses Diagrammtyps | |
7348 möglich, obwohl WSP Berechnung keine Ergebnisse liefert) | |
7349 | |
7350 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
7351 (compute): Add Facets regarding CrossSections only if data available. | |
7352 | |
7353 2011-09-29 Ingo Weinzierl <ingo@intevation.de> | |
7354 | |
7355 flys/issue176 (Diagramm: Benennung eines Abflusses bei gewählter Höhe am Pegel) | |
7356 flys/issue349 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
7357 | |
7358 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
7359 Create titles for W and Q waterlevel facets with proper fractions. | |
7360 | |
7361 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7362 | |
7363 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7364 (createStaticData, getLabels): Create proper labels for differences. | |
7365 | |
7366 2011-09-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7367 | |
7368 flys/issue244 (WINFO: Export von AT-Dateien im ersten Teil unterschiedlich) | |
7369 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
7370 | |
7371 * src/main/java/de/intevation/flys/exports/ATWriter.java: Due to a rounding | |
7372 issue the w's of the first line underun the minimal w of the curve at times. | |
7373 An extra test was introduced to suppress the output of the q's of the wrong w's. | |
7374 | |
7375 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7376 | |
7377 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7378 Use StringUtil.wWrap , fix wrong loop, minor refac and cosmetics. | |
7379 | |
7380 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7381 | |
7382 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7383 Extracted/use StringUtil.wWrap . | |
7384 | |
7385 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
7386 | |
7387 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
7388 Log the gauge which has been determined. | |
7389 | |
7390 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
7391 | |
7392 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
7393 | |
7394 * src/main/java/de/intevation/flys/exports/ATExporter.java: Store the | |
7395 master Artifact which is set via setMasterArtifact(). This is required | |
7396 for meta information used while preparing the header row of AT exports. | |
7397 | |
7398 * src/main/java/de/intevation/flys/exports/ATWriter.java: Print a header | |
7399 row into the AT export for being compatible with desktop FLYS. | |
7400 | |
7401 * src/main/resources/messages.properties, | |
7402 src/main/resources/messages_de_DE.properties, | |
7403 src/main/resources/messages_en.properties, | |
7404 src/main/resources/messages_de.properties: Added header row for AT | |
7405 export files. | |
7406 | |
7407 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
7408 | |
7409 flys/issue328 (W-INFO / ÜSK: Auswahl der Wasserspiegellage / Auswahlunterstützung) | |
7410 | |
7411 * doc/conf/meta-data.xml: Added an out 'waterlevels' that might be used to | |
7412 fetch user specific waterlevels (same as longitudinal sections, but | |
7413 without Q facet). | |
7414 In addition, the system specific datacage stuff is now fetched, when: | |
7415 a) no user-id is given | |
7416 b) a user-id is given and there is a parameter 'load-system' | |
7417 | |
7418 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7419 If the label of the WQKms object specified by the waterlevel selection | |
7420 begins with a "Q", the label is wrapped into a "W()", e.g. "W(Q=1200)". | |
7421 | |
7422 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
7423 | |
7424 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Made | |
7425 feed() able to remove existing data items from Artifact's data pool. | |
7426 Therefore, the value for the item which should be removed needs to an | |
7427 empty string. | |
7428 | |
7429 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7430 | |
7431 Extracted StringUtil.unbracket from WaterlevelSelectState.strip. | |
7432 | |
7433 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7434 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7435 Extract and use StringUtil.unbracket, minor doc. | |
7436 | |
7437 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7438 | |
7439 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
7440 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
7441 Changed access of getCurrentState() from protected to public. | |
7442 | |
7443 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: We | |
7444 use the configured Outputs instead of the actuel Outputs of an Artifact | |
7445 to make recommendations, now. This has the bad side effect of giving | |
7446 recommendations for Outputs that we might _NOT_ be able to produce. But | |
7447 otherwise, we would not be able to give recommendations for states with | |
7448 long calculation times that start background threads for calculation (as | |
7449 WSPLGEN caluclations does). | |
7450 | |
7451 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7452 | |
7453 Enable "auto-scaling" axis for waterlevels in WDifference-plots. | |
7454 | |
7455 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7456 (createSecondaryAxis, zoomY): Refactored to allow modification in | |
7457 siblings. | |
7458 | |
7459 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7460 (createSecondaryAxisRange): Override to achieve expected behavior. | |
7461 Also adjusted label. | |
7462 | |
7463 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7464 | |
7465 In W-Difference Calculation, respect indices of selected facets. | |
7466 | |
7467 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7468 (computeAdvance): Respect index of selected facets. | |
7469 | |
7470 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7471 | |
7472 flys/issue317: (Querprofil-Diagramm: Referenzen auf CrossSectionApp entfernen) | |
7473 | |
7474 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7475 Removed dependency to demo app. | |
7476 | |
7477 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
7478 Refactored to use logic from the models. | |
7479 | |
7480 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
7481 Moved some logic from the demo app to this model. | |
7482 | |
7483 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7484 | |
7485 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: New. Code | |
7486 from FloodMapState moved to its own class with the intent, to use it in | |
7487 classes different from FloodMapState. | |
7488 | |
7489 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7490 Removed the inner class FacetCreator. | |
7491 | |
7492 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
7493 an instance of FacetCreator. | |
7494 NOTE: Maybe we should move the WSPLGEN parameters into an own class | |
7495 which might be serializable. | |
7496 | |
7497 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use the | |
7498 FacetCreator instance stored in the WSPLGENJob to create a new WSPLGEN | |
7499 facet if the calculation was successfully (without errors). Finally, the | |
7500 facets of FacetCreator are added to the Facet list of the FLYSArtifacts. | |
7501 | |
7502 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7503 | |
7504 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7505 Put Artifact in background mode first before starting WSPLGEN, otherwise | |
7506 a very fast errors (call CallContext.afterBackground() before Artifact is | |
7507 in Background mode) might lead to an inconsistent state. | |
7508 | |
7509 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Repaired | |
7510 broken error num parsing. | |
7511 | |
7512 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7513 | |
7514 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Track | |
7515 critical errors as well (improved regular expression for errors). | |
7516 | |
7517 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7518 | |
7519 * ChangeLog: Fixed whitespace usage. | |
7520 | |
7521 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7522 | |
7523 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java, | |
7524 src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java | |
7525 src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
7526 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7527 Removed superfluous imports. | |
7528 | |
7529 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7530 | |
7531 flys/issue68 (Diagramm: Werte an der Y-Achse benötigen i18n) | |
7532 | |
7533 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
7534 method to retrieve the current/preferred locale specified by CallMeta. | |
7535 | |
7536 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7537 Introduced two methods localizeDomainAxis() and localizeRangeAxis(). | |
7538 Both methods of this class override the NumberFormat used to format axes | |
7539 numbers. Those methods are called by localizeAxes() - which has private | |
7540 access - for each domain and range axis of the current XYPlot. | |
7541 | |
7542 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7543 | |
7544 * doc/conf/cache.xml: Number of cached annotations was much | |
7545 to low. | |
7546 | |
7547 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7548 | |
7549 Improved w-differences diagram generation where multiple differences | |
7550 can be shown. | |
7551 | |
7552 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
7553 New facet type. | |
7554 | |
7555 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7556 Employ new DifferenceCurveFacet, return CalculationResult that can | |
7557 store more than one WKms. | |
7558 | |
7559 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7560 | |
7561 flys/issue320 (ÃœSK:Mapserver hat Probleme beim Shapefilepath mit "../" im Pfad) | |
7562 | |
7563 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Use | |
7564 File.getCanonicalPath() to substitute "../" in shapefile directories. | |
7565 | |
7566 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
7567 | |
7568 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7569 The extent of the WSPLGEN result layer is now specified by the extent of | |
7570 the CrossSectionTracks that matches the start and end kilometer of the | |
7571 WSPLGEN calculation. | |
7572 | |
7573 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New function | |
7574 that creates the OpenLayers bounding box based on two Geometries. | |
7575 | |
7576 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7577 | |
7578 Improved w-differences diagram generation with included "absolute" | |
7579 values. | |
7580 | |
7581 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7582 Fixed one (of two) incorrect labels. | |
7583 (doWaterlevelOut): Survive non-found gauge, fetch kilometer and w | |
7584 instead of values for w and q. | |
7585 | |
7586 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7587 | |
7588 Add positional-conflict-awareness when merging Facets for a | |
7589 FLYSArtifactCollection. First come first serve. | |
7590 | |
7591 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7592 (writeFacets): First, sort incoming facets into 2 groups: | |
7593 "genuinely new" and "already there", then for each new check | |
7594 whether the position is already taken. If so, push "up" (position++) | |
7595 until no conflict exists anymore. | |
7596 | |
7597 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
7598 | |
7599 flys/issue296 (Karte: Bezeichnungen verbessern) | |
7600 | |
7601 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7602 I18N of the WSPLGEN and barriers facets (WMS layers). | |
7603 | |
7604 * src/main/resources/messages.properties, | |
7605 src/main/resources/messages_de_DE.properties, | |
7606 src/main/resources/messages_en.properties, | |
7607 src/main/resources/messages_de.properties: Added strings for the wsplgen | |
7608 and barriers WMS layers. | |
7609 | |
7610 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7611 | |
7612 Fix (revert) access to position in ManagedDomFacet. | |
7613 | |
7614 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
7615 (getPosition): Do not add prefix when querying position ("pos") | |
7616 attribute, add a logger for faster future debugging. | |
7617 | |
7618 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7619 | |
7620 Squash positional conflict-bug. | |
7621 | |
7622 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7623 (mergeFacets): Removed, replaced in parts by pickFacet. | |
7624 (pickFacet): New, return facet to be added to document. | |
7625 Documentation added. | |
7626 | |
7627 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7628 | |
7629 Squash a bug about wrongly named "art:pos" attribute in ManagedDomFacet (was | |
7630 "pos"). Added documentation from commit message. | |
7631 | |
7632 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
7633 Added documentation (commit message with minor adjustments). | |
7634 (getPosition, setPosition): Include PREFIX in attribute name. | |
7635 | |
7636 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7637 | |
7638 Refactoring, doc. | |
7639 | |
7640 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7641 (mergeFacets): Removed, replaced in parts by pickFacet. | |
7642 (pickFacet): New, return facet to be added to document. | |
7643 Documentation added. | |
7644 | |
7645 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7646 | |
7647 Cosmetics, docs. | |
7648 | |
7649 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7650 Documentation added. | |
7651 | |
7652 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7653 | |
7654 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
7655 Subclasses the FLYSService now - this should improve the database | |
7656 connection handling. | |
7657 | |
7658 2011-09-22 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7659 | |
7660 * doc/mapserver/mosel-mapfile.map: | |
7661 Full blown mosel wms mapfile. | |
7662 | |
7663 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7664 | |
7665 * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: | |
7666 New. A subclass of DefaultService which is used in FLYS to init and | |
7667 shutdown database connections. | |
7668 | |
7669 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
7670 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
7671 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7672 Centralized the initialization and shutdown of database connections. | |
7673 These services now subclass FLYSService which handles the database stuff. | |
7674 | |
7675 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: The | |
7676 current database connection is not closed here - this is done in a | |
7677 Service or in the CallContext. | |
7678 | |
7679 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: It's | |
7680 not necessary to create new database connections here. We already have | |
7681 an existing connection which is initialized by CallContext. | |
7682 | |
7683 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7684 | |
7685 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
7686 Override validate() of parent classes to suppress "step" validation | |
7687 which is not present in this state. | |
7688 | |
7689 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: Added | |
7690 new method validateBounds() which really just validates a boundary | |
7691 without "step" parameter. | |
7692 | |
7693 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7694 | |
7695 Added WaterlevelArtifact to accompany WINFOArtifacts in WDifferencesPlots. | |
7696 | |
7697 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
7698 New WaterlevelArtifact. | |
7699 | |
7700 * doc/conf/conf.xml: | |
7701 Added configuration for WaterlevelArtifact configuration (path to state-xml) | |
7702 waterlevel-factory. | |
7703 | |
7704 * doc/conf/artifacts/waterlevel.xml: | |
7705 New, trivial state description for Waterlevelartifact. | |
7706 | |
7707 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
7708 New, only state for WaterlevelArtifact. | |
7709 | |
7710 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7711 | |
7712 Cosmetics, docs. | |
7713 | |
7714 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
7715 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
7716 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7717 Cosmetics, documentation. | |
7718 | |
7719 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7720 | |
7721 Added WaterlevelOut-processing ability to WDifferencesCurveGenerator. | |
7722 | |
7723 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7724 Process LONGITUDINAL_W facets. | |
7725 | |
7726 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7727 | |
7728 Improved WDifferenceState in preparation to be able to deal with multiple | |
7729 pairs for differences. | |
7730 | |
7731 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7732 Prepare multiple-pairs-case. | |
7733 | |
7734 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
7735 | |
7736 flys/issue315 (Überschwemmungsfläche: String bei Streckenauswahl) | |
7737 | |
7738 * doc/conf/artifacts/winfo.xml: Added a new state for floodmap's range | |
7739 input. This state will accept a km range only, there is no step width. | |
7740 | |
7741 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
7742 New. The state which is used to enter a km range with step width. | |
7743 | |
7744 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7745 | |
7746 Cosmetics, improved debug output, doc. | |
7747 | |
7748 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
7749 Improved debug output. | |
7750 | |
7751 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
7752 Added documentation. | |
7753 | |
7754 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
7755 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
7756 Removed commented code. | |
7757 | |
7758 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
7759 Whitespace cosmetics. | |
7760 | |
7761 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7762 | |
7763 Avoid NullPointerException when drawing XYChart without data. | |
7764 | |
7765 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7766 Guard calls to dataset to avoid NullPointerException. | |
7767 | |
7768 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
7769 | |
7770 flys/issue325 (FLYS Client: Auswahl des DGM zeigt numerischen Wert an) | |
7771 | |
7772 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Write | |
7773 a better label for the selected DEM into the static DESCRIBE. Use the | |
7774 name of the DEM file as label instead of the database id. | |
7775 | |
7776 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7777 | |
7778 * doc/mapserver/fontset.txt: | |
7779 Added initial font set for km_annotation layer. | |
7780 * doc/mapserver/symbols/symbols.sym: | |
7781 Added square symbol for km and fixpoint layer. | |
7782 * doc/mapserver/saar-mapfile.map: | |
7783 Adjust styling in the flys karte-archiv way. | |
7784 | |
7785 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
7786 | |
7787 Tagged RELEASE 2.5 | |
7788 | |
7789 * Changes: Prepared changes for release. | |
7790 | |
7791 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
7792 | |
7793 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7794 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
7795 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
7796 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
7797 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
7798 needless imports. | |
7799 | |
7800 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7801 | |
7802 * doc/conf/meta-data.xml: Improved datacage configuration for DEMs. | |
7803 | |
7804 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7805 Query DGMs by the given ID in the FLYS data pool - not by given range | |
7806 values. | |
7807 | |
7808 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7809 | |
7810 * doc/conf/meta-data.xml: Added a section for DEMs to the floodmap | |
7811 section. | |
7812 | |
7813 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7814 | |
7815 Fix build. | |
7816 | |
7817 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
7818 Fix build. | |
7819 | |
7820 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7821 | |
7822 Take a given WaterlevelPair-String, load artifact and plot the diff. | |
7823 | |
7824 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
7825 Load correct artifacts. | |
7826 | |
7827 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7828 | |
7829 * doc/mapserver/*: Added inital mapserver configuration files. | |
7830 | |
7831 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7832 | |
7833 * doc/conf/meta-data.xml: Moved the system specific configuration into a | |
7834 macro to the top of the configuration document. Call this macro at the | |
7835 end of the user specific part and in the part that should contain the | |
7836 system specific stuff only! | |
7837 | |
7838 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7839 | |
7840 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7841 Defined createItem() here and adapted some method signatures, because I | |
7842 need the CallContext deeper in code than expected. | |
7843 | |
7844 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7845 Write the name of the selected waterlevel into the static DESCRIBE. | |
7846 | |
7847 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
7848 Adapted method signatures that have been changed in DefaultState. | |
7849 | |
7850 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7851 Removed method createItem() which is now defined in the upper class | |
7852 DefaultState. | |
7853 | |
7854 * src/main/resources/messages.properties, | |
7855 src/main/resources/messages_de_DE.properties, | |
7856 src/main/resources/messages_en.properties, | |
7857 src/main/resources/messages_de.properties: Added string for selected | |
7858 waterlevel that is displayed in static UI. | |
7859 | |
7860 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7861 | |
7862 * src/main/resources/messages.properties, | |
7863 src/main/resources/messages_de_DE.properties, | |
7864 src/main/resources/messages_en.properties, | |
7865 src/main/resources/messages_de.properties: Added state label for | |
7866 waterlevel selection. | |
7867 | |
7868 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7869 | |
7870 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7871 Validate incoming data string and strip brackets. | |
7872 | |
7873 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7874 Fetch waterlevel data from external Artifact if existing. If no external | |
7875 Artifact is specified that provides waterlevel data, we gonna try to | |
7876 fetch it from the current Artifact. | |
7877 | |
7878 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7879 | |
7880 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7881 Removed needless import which caused compile errors. | |
7882 | |
7883 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7884 | |
7885 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7886 Added a transform() method. This method should be used to transform | |
7887 input data in form of a string into a better data structure. This state | |
7888 provides a simple implementation which just returns a StateData object | |
7889 that contains exactly the input string. | |
7890 | |
7891 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Transform | |
7892 input strings using DefaultState.transform() before they are added to | |
7893 its data pool. | |
7894 | |
7895 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7896 | |
7897 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7898 Made collection solid for the case if it has no Artifacts. | |
7899 | |
7900 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7901 | |
7902 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Fetch Artifact | |
7903 from ArtifactDatabase properly. Write better error logs if that process | |
7904 fails. | |
7905 | |
7906 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7907 | |
7908 Extend WDifferences branch to have calculations in dedicated, new state. | |
7909 | |
7910 * doc/conf/artifacts/winfo.xml: Added new State and Transition in | |
7911 WDifferences-branch. | |
7912 | |
7913 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7914 New state. | |
7915 | |
7916 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7917 Specify to not take input, prepare getting other facets. | |
7918 | |
7919 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
7920 | |
7921 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: This | |
7922 state now desires the UIProvider 'dem_datacage_panel'. | |
7923 | |
7924 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7925 New. This state is used to define the desired UIProvider | |
7926 'wsp_datacage_panel'. | |
7927 | |
7928 * doc/conf/artifacts/winfo.xml: Added a new way to start a WSPLGEN | |
7929 calculation when choosing the calculation type 'floodmap'. | |
7930 | |
7931 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
7932 | |
7933 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Merge | |
7934 facets only if their name AND their owner artifact are equal. | |
7935 | |
7936 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7937 | |
7938 Partial Fix flys/issue304 (3) (Baseline). | |
7939 | |
7940 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7941 Show Baseline in WDifferencesPlot. | |
7942 | |
7943 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7944 | |
7945 Fix flys/issue310 (cross-section theme). | |
7946 | |
7947 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
7948 | |
7949 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7950 | |
7951 Fix flys/issue310 (cross-section theme). | |
7952 | |
7953 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
7954 | |
7955 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
7956 | |
7957 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7958 Add an quick and simple error to the report if an error occured while | |
7959 WSPLGENJob creation. | |
7960 | |
7961 * src/main/resources/messages.properties, | |
7962 src/main/resources/messages_de_DE.properties, | |
7963 src/main/resources/messages_en.properties, | |
7964 src/main/resources/messages_de.properties: Added error messages for | |
7965 WSPLGEN job creation errors. | |
7966 | |
7967 2011-09-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7968 | |
7969 Fix crash when drawing StickyAxisAnnotation when no range was given. | |
7970 User-directed issues remain ( flys/issue303 ). | |
7971 | |
7972 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java | |
7973 (draw): | |
7974 Guard access to domainAxis, rangeAxis and the corresponding ranges. | |
7975 Warn and exit if any was null. | |
7976 | |
7977 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
7978 | |
7979 flys/issue290 (Karte: Eingabe von Differenzen zw. WSP und Gelände findet | |
7980 keine Ausprägung in der Karte) | |
7981 | |
7982 * doc/conf/mapserver/wsplgen_class.vm: Added styles for DIFF attribute. | |
7983 | |
7984 * doc/conf/mapserver/mapfile.vm: Set debug default to '5'. | |
7985 | |
7986 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7987 | |
7988 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7989 Add a first WSPLGEN status message (notifies the user about a | |
7990 queued job) after the job has been added to the Scheduler. | |
7991 | |
7992 * src/main/resources/messages.properties, | |
7993 src/main/resources/messages_de_DE.properties, | |
7994 src/main/resources/messages_en.properties, | |
7995 src/main/resources/messages_de.properties: Added english and german | |
7996 status message text. | |
7997 | |
7998 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7999 | |
8000 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Write | |
8001 shapefiles only if there are features for it existing. | |
8002 | |
8003 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8004 A WSPLGEN facet is only created, if the calculation was successfully | |
8005 added to the Scheduler. A barrier facet is only created if the WSPLGEN | |
8006 calculation has been added to the scheduler AND if there are digitized | |
8007 geometries existing. | |
8008 | |
8009 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8010 | |
8011 Copied and slightly modified implementation of guessWaterIncreasing from | |
8012 WQKms to (new) DataUtils. Accidentally commited usage in last commit, to | |
8013 correct orientation of diagram (invert x axis). | |
8014 | |
8015 * src/main/java/de/intevation/flys/utils/DataUtils.java: | |
8016 New file with guessWaterIncreasing implementation from WQKms, | |
8017 slightly adjusted. | |
8018 | |
8019 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8020 | |
8021 Cosmetics. | |
8022 | |
8023 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
8024 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
8025 Cosmetics. | |
8026 | |
8027 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8028 | |
8029 Added CSV Export for W-Differences. | |
8030 | |
8031 * doc/conf/conf.xml: Added Exporter. | |
8032 | |
8033 * doc/conf/artifacts/winfo.xml: Removed transition over distances | |
8034 state, added export outputmode and facet. | |
8035 | |
8036 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
8037 New, CSV-Exporter for WDifferences. | |
8038 | |
8039 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
8040 Add export facet. | |
8041 | |
8042 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8043 | |
8044 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
8045 Cosmetics, docs. | |
8046 | |
8047 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
8048 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
8049 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
8050 Cosmetics. | |
8051 | |
8052 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
8053 | |
8054 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
8055 Sourced the code to append a concrete data item to the static DESCRIBE | |
8056 part out to an own method (appendStaticData()). | |
8057 | |
8058 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
8059 Override appendStaticData() to suppress the GeoJSON string to be | |
8060 included in the static DESCRIBE. | |
8061 | |
8062 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
8063 | |
8064 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
8065 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
8066 src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
8067 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
8068 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
8069 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
8070 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8071 Removed needless imports. | |
8072 | |
8073 2011-09-09 Ingo Weinzierl <ingo@intevation.de> | |
8074 | |
8075 * src/main/java/de/intevation/flys/artifacts/model/CalculationMessage.java: | |
8076 New. A subclass of Message (in the Artifacts system). It stores a | |
8077 string message and a progress (in form of step x/y). | |
8078 | |
8079 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: The observer | |
8080 now writes background messages into the artifact system using the | |
8081 CallContext.addBackgroundMessage(). We use instances of | |
8082 CalculationMessage here, that makes the WINFOArtifact able to put | |
8083 progress information into the Artifact's DESCRIBE as well. | |
8084 | |
8085 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Write | |
8086 status message and progress information into the DESCRIBE if the | |
8087 Artifact has started a background process. | |
8088 | |
8089 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8090 | |
8091 Fix flys/issue280 . | |
8092 | |
8093 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8094 Do not draw boxes around annotations. | |
8095 | |
8096 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8097 | |
8098 Fix flys/issue279 . | |
8099 | |
8100 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8101 Fix behaviour in various thinkable malconditions. | |
8102 | |
8103 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8104 | |
8105 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8106 Made one case of cross section fetching more robust. | |
8107 | |
8108 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8109 | |
8110 Fix Facet name and Legend of W-Differences, also insert state to specify | |
8111 distance. | |
8112 | |
8113 * doc/conf/artifacts/winfo.xml: Add additional transitions to walk over | |
8114 distances state. | |
8115 | |
8116 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
8117 Set facets description. | |
8118 | |
8119 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
8120 Take facets description as legend. | |
8121 | |
8122 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8123 | |
8124 Added configuration to kick-in w-differences branch of winfo. | |
8125 | |
8126 * doc/conf/conf.xml: Register new (w-differences) OutputGenerators. | |
8127 | |
8128 * doc/conf/artifacts/winfo.xml: Register new state and transitions. | |
8129 | |
8130 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
8131 Added new (w-differences) calculation mode. | |
8132 | |
8133 * src/main/java/de/intevation/flys/exports/WDifferencesCurveInfoGenerator.java: | |
8134 New file, implementing naive approach to display w-differences | |
8135 (accidentially omitted in last commit). | |
8136 | |
8137 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8138 | |
8139 Added very stubby WDifferences State/OutGenerator for WINFOArtifact. | |
8140 | |
8141 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8142 Added w_differences facet type. | |
8143 | |
8144 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
8145 New file, implements naive approach to calculate w-differences (of | |
8146 calculations identified by hardcoded uuids!) and register respective facet. | |
8147 | |
8148 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
8149 New file, implementing naive approach to display w-differences. | |
8150 | |
8151 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8152 | |
8153 Implement getArtifact(uuid,context) in FLYSUtils. | |
8154 | |
8155 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getArtifact): | |
8156 Added implementation, partially resolving a TODO. Added logger instance. | |
8157 | |
8158 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
8159 | |
8160 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: | |
8161 New. This sublcass of Calculation saves warnings and errors that occur | |
8162 while WSPLGEN is running. | |
8163 Note, that the interface of this class doesn't exactly apply the interface | |
8164 of Calculation. Maybe, we should generalize this interface! | |
8165 | |
8166 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
8167 an instance of WSPLGENCalculation now. We use this instance to save | |
8168 warnings and errors. | |
8169 | |
8170 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Use the | |
8171 WSPLGENCalculation to save errors and warnings. | |
8172 | |
8173 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENReportFacet.java: | |
8174 New. This facet is used for WSPLGEN reports. It stores an instance of | |
8175 WSPLGENCalculation which saves ERRORS and WARNINGS that occur while | |
8176 WSPLGEN execution. | |
8177 | |
8178 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8179 Create a WSPLGENReportFacet for WSPLGEN reports. | |
8180 | |
8181 * doc/conf/conf.xml: Added an OutputGenerator 'report' for WSPLGEN | |
8182 reports. | |
8183 | |
8184 * doc/conf/artifacts/winfo.xml: Added an output 'report' for WSPLGEN | |
8185 reports. | |
8186 | |
8187 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8188 | |
8189 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
8190 src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java, | |
8191 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
8192 Cosmetics, docs. | |
8193 | |
8194 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
8195 | |
8196 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: Small | |
8197 adjustments that makes it easier to subclass this observer. | |
8198 | |
8199 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: New. A | |
8200 sublcass of JobObserver which analyses the WSPLGEN output for errors and | |
8201 warnings. | |
8202 | |
8203 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use | |
8204 JobObserver and ProblemObserver to track the whole WSPLGEN output and | |
8205 print number of errors/warnings to log output. | |
8206 | |
8207 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8208 | |
8209 Added translation of w_differences. | |
8210 | |
8211 * src/main/resources/messages_de_DE.properties, | |
8212 src/main/resources/messages_de.properties, | |
8213 src/main/resources/messages_en.properties, | |
8214 src/main/resources/messages.properties: | |
8215 Added "w_differnces" translation. | |
8216 | |
8217 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
8218 | |
8219 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
8220 a new attribute 'background-processing' to the DESCRIBE of this | |
8221 Artifact. Its value is 'true' if this Artifact has started a background | |
8222 thread which has not finished yet - otherwise it is 'false. | |
8223 | |
8224 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
8225 | |
8226 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
8227 src/main/java/de/intevation/flys/utils/GeometryUtils.java: Moved the | |
8228 code to determine the extent of a river based on its axis to | |
8229 GeometryUtils. | |
8230 | |
8231 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8232 Determine the extent of the selected river and set the WMSLayerFacet's | |
8233 extent attribute. | |
8234 | |
8235 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8236 | |
8237 Added Themeing support for CrossSection Diagrams. | |
8238 | |
8239 * doc/conf/themes.xml: | |
8240 Added new themes and mappings, slightly modified longitudinalsection | |
8241 theme. | |
8242 | |
8243 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8244 | |
8245 In CrossSection Diagram fix subtitle to display the km of which the data is | |
8246 actually displayed (maybe contrasting users wish). | |
8247 | |
8248 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8249 (getCrossSectionSnapKm): New method to fetch the actual km of crosssection. | |
8250 | |
8251 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8252 Add correct km to charts subtitle. | |
8253 | |
8254 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8255 | |
8256 Fix various display-issues like i18n in cross-section diagram. | |
8257 | |
8258 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8259 Set description of facets to expected values. | |
8260 | |
8261 * src/main/java/de/intevation/flys/artifacts/exports/CrossSectionGenerator.java: | |
8262 Fix i18n of chart title. Set subtitle to expected value, pass facets | |
8263 description to StyledSeries to see expected legend. | |
8264 | |
8265 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8266 | |
8267 Cosmetics, resolved refactoring todo. | |
8268 | |
8269 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java | |
8270 (compute, computeAdvance, computeFeed): Refactored, extracted method, | |
8271 resolving duplicate code and TODO. | |
8272 | |
8273 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8274 | |
8275 Fix waterline "calculation" at given km. Chosen approach is | |
8276 "head-through-wall". | |
8277 | |
8278 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8279 Some refactoring to do the same calculation twice easier and be able | |
8280 to "cross" waterline against correct profile data. | |
8281 | |
8282 | |
8283 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8284 | |
8285 Fix setting of kilometer for profile (not yet waterlevel) of cross section | |
8286 diagram. | |
8287 | |
8288 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8289 (getCrossSectionData): Respect corss_section.km data; do naive linear | |
8290 search for profile data for this km. | |
8291 | |
8292 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
8293 Declare a ComputeType. | |
8294 | |
8295 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8296 Implement computeFeed. | |
8297 | |
8298 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8299 | |
8300 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
8301 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8302 Minor cosmetics. | |
8303 | |
8304 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8305 | |
8306 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
8307 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
8308 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
8309 src/main/java/de/intevation/flys/artifacts/state/DefaultState.java: | |
8310 Cosmetics, docs. | |
8311 | |
8312 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
8313 | |
8314 * doc/conf/mapserver/barrier_polygons_class.vm, | |
8315 doc/conf/mapserver/barrier_lines_class.vm, | |
8316 doc/conf/mapserver/wsplgen_class.vm: Default Mapserver styles for | |
8317 barriers and WSPLGEN results. Those styles are only used as long as we | |
8318 don't have map specific themes (as already used in charts). | |
8319 | |
8320 * doc/conf/mapserver/layer.vm: Implements a fallback mechanism for styling | |
8321 barrier lines/polygons and WSPLGEN results. | |
8322 | |
8323 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added a | |
8324 getStyle() method that currently returns "null". This method needs to be | |
8325 implemented when map themes are introduced. | |
8326 | |
8327 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
8328 | |
8329 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Renamed | |
8330 some attributes to make their job in the mapfile more obvious. | |
8331 | |
8332 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
8333 new facet type for barriers. | |
8334 | |
8335 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: Add | |
8336 a facet for the barriers layer. | |
8337 | |
8338 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Parse | |
8339 barriers (lines and polygons) and create two new layers for each type - | |
8340 those layers are grouped. | |
8341 | |
8342 * doc/conf/mapserver/layer.vm: Renamed attribute based on changes in | |
8343 LayerInfo and added support for Group-Layers. | |
8344 | |
8345 2011-09-06 Raimund Renkert <raimund.renkert@intevation.de> | |
8346 | |
8347 * doc/conf/conf.xml: | |
8348 Added driver to database configuration for use with postgresql. | |
8349 | |
8350 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
8351 | |
8352 * doc/conf/mapserver/mapfile.vm: Removed FONTSET attribute and set quotes | |
8353 for SHAPEPATH. | |
8354 | |
8355 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
8356 | |
8357 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
8358 Removed. We gonna use the WMSLayerFacet until now. | |
8359 | |
8360 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8361 Add a WMSLayerFacet after we triggered the Scheduler to start a WSPLGEN | |
8362 calculation. | |
8363 | |
8364 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
8365 | |
8366 * doc/conf/mapserver/layer.vm, | |
8367 doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements. | |
8368 | |
8369 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the | |
8370 MapfileGenerator after a WSPLGEN job has finished regardless if it has | |
8371 been finished successfully or not. | |
8372 | |
8373 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
8374 | |
8375 * pom.xml: Added Apache Velocity 1.7 for templating support. | |
8376 | |
8377 * doc/conf/conf.xml: Added config options for mapserver/template relevant | |
8378 stuff. | |
8379 | |
8380 * doc/conf/mapserver/mapfile.vm, | |
8381 doc/conf/mapserver/layer.vm: New. A default mapfile template and a | |
8382 template used for layers. | |
8383 | |
8384 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: New. | |
8385 This class is used while reading WMS layer relevant information from | |
8386 filesystem. | |
8387 | |
8388 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: New. This | |
8389 thread is used for creating mapfiles for Mapserver. The MapfileGenerator | |
8390 runs in daemon mode (own thread) and creates mapfiles based on WMS | |
8391 layer relevant information read from filesystem. | |
8392 | |
8393 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
8394 src/main/java/de/intevation/flys/utils/FLYSUtils.java: Moved shapefile | |
8395 specific XPath expressions from FloodMapState to FLYSUtils which is a | |
8396 better place to use it in other classes (as MapfileGenerator). | |
8397 | |
8398 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
8399 | |
8400 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: | |
8401 Bugfixed broken attribute assignment. | |
8402 | |
8403 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Call | |
8404 CallContext.afterBackground() after a WSPLGEN job has finished to remove | |
8405 the background lock from Artifact. | |
8406 | |
8407 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8408 Call CallContext.afterCall(BACKGROUND) to lock the Artifact for | |
8409 background processing. | |
8410 | |
8411 2011-09-02 Ingo Weinzierl <ingo@intevation.de> | |
8412 | |
8413 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: New. This | |
8414 class is used to start WSPLGEN for a specific WSPLGENJob. The System | |
8415 property "wsplgen.bin.path" tells the JobExecutor where the WSPLGEN | |
8416 binary is placed (which means in general, the property points to the | |
8417 'wsplgen.exe'). | |
8418 | |
8419 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: New. This | |
8420 scheduler currently allows to start just a single WSPLGEN Thread. All | |
8421 WSPLGEN calculations should be started using Scheduler.addJob(). | |
8422 | |
8423 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: New. This | |
8424 thread reads log messages from WSPLGEN and listens for specific | |
8425 messages. It should be used to update status messages of the WSPLGEN | |
8426 calculation that is currently running. | |
8427 There is a System property that tells the JobObserver to log all WSPLGEN | |
8428 output to log4j: enable WSPLGEN output with "-Dwsplgen.log.output=true". | |
8429 | |
8430 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Added | |
8431 the FLYSArtifact, the current working directory and the CallContext. | |
8432 | |
8433 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8434 Use the Scheduler to start new WSPLGEN calculations. | |
8435 | |
8436 2011-09-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8437 | |
8438 Add CrossSectionInfoGenerator. | |
8439 | |
8440 * src/main/java/de/intevation/flys/exports/CrossSectionInfoGenerator.java: | |
8441 New, trivial implementation of CrossSectionInfoGenerator. | |
8442 | |
8443 * doc/conf/conf.xml: | |
8444 Register CrossSectionInfoGenerator. | |
8445 | |
8446 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8447 | |
8448 Cleanups of CrossSection*. | |
8449 | |
8450 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8451 New methods to retrieve name of utilized CrossSection. | |
8452 | |
8453 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8454 Cleanup, get rid of copied unused method, documentation and more sensible | |
8455 translations. | |
8456 | |
8457 * src/main/resources/messages_de_DE.properties, | |
8458 src/main/resources/messages_de.properties, | |
8459 src/main/resources/messages_en.properties, | |
8460 src/main/resources/messages.properties: | |
8461 Added cross_section* translations, also cleanups. | |
8462 | |
8463 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8464 | |
8465 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8466 Set the "typ" attribute of lines and polygons in barrier shapefiles. | |
8467 | |
8468 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8469 | |
8470 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8471 Set the Z values of line and polygon barrier geometries. Both barrier | |
8472 shapefiles will contain 3D geometries now. | |
8473 | |
8474 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8475 | |
8476 Get real data to display in CrossSection (although ignorant of | |
8477 parameterization), making use of the showcase code of the CrossSectionApp- | |
8478 Standalone application. | |
8479 | |
8480 * doc/conf/artifacts/winfo.xml: Add new facet (~waterline) to state/out. | |
8481 | |
8482 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8483 New methods to get relevant data. So far just takes the first value of | |
8484 everything and assuming a waterlevel at 130m. | |
8485 | |
8486 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
8487 New Facet responsible of water level in cross section. | |
8488 | |
8489 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
8490 Made some functionality publicly and statically available. | |
8491 | |
8492 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
8493 Update call. | |
8494 | |
8495 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added new | |
8496 Facet type. | |
8497 | |
8498 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8499 Added new Facet to out. | |
8500 | |
8501 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8502 Respect new facet and facets data. | |
8503 | |
8504 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8505 | |
8506 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Close an open | |
8507 shapefile transaction and catch exceptions which are thrown while | |
8508 shapefile creation here. If there occured an error, this functions | |
8509 returns FALSE, otherwise TRUE. | |
8510 | |
8511 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8512 Removed exception handling while shapefile creation - this is done in | |
8513 GeometryUtils now. | |
8514 | |
8515 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8516 | |
8517 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8518 Renamed the file for WSPLGEN required waterlevels to "waterlevels.wst". | |
8519 WSPLGEN did not work with the former "waterlevels.txt" file. | |
8520 | |
8521 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8522 | |
8523 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New static | |
8524 function that builds new SimpleFeatureTypes with additional attributes. | |
8525 | |
8526 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8527 Write attributes "ELEVATION" and "KILOMETER" into the crosssection | |
8528 tracks shapefiles. | |
8529 | |
8530 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8531 | |
8532 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
8533 stub that should return a FLYSArtifact based on a given UUID. | |
8534 | |
8535 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8536 Write the selected WST file for WSPLGEN. Note, that this is the WST file | |
8537 of the current WINFO artifact. Furthermore, there is currently no way | |
8538 for the user to select a column from WST file, so we currently use the | |
8539 column that is written to WST file at first. | |
8540 | |
8541 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8542 | |
8543 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
8544 the parameter order of a compute(...) method. This makes me able to call | |
8545 this without a hash value. | |
8546 | |
8547 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
8548 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
8549 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
8550 Adapted the parameter order of the compute() call (see above). | |
8551 | |
8552 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8553 | |
8554 More bones to CrossSection sceleton. | |
8555 | |
8556 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
8557 src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
8558 New, yet trivial implementations of Factory and Facet for CrossSections. | |
8559 | |
8560 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8561 Add new CrossSection- (instead of Default-)Facet. | |
8562 | |
8563 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
8564 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8565 Adjusted to use (touch) new Factory and Facet. | |
8566 | |
8567 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8568 | |
8569 Cosmetics. | |
8570 | |
8571 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8572 Cosmetics. | |
8573 | |
8574 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8575 | |
8576 Cosmetics. | |
8577 | |
8578 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
8579 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8580 src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
8581 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8582 Removed obselete imports. | |
8583 | |
8584 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8585 Removed obselete imports, whitespaces. | |
8586 | |
8587 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8588 Whitespaces, docs. | |
8589 | |
8590 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8591 | |
8592 Fix translations of Main Values Facets. | |
8593 | |
8594 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8595 Do acrobatics to keep state transient but get translated title. | |
8596 | |
8597 * src/main/java/de/intevation/flys/artifacts/MainValuesQFacet.java, | |
8598 src/main/java/de/intevation/flys/artifacts/MainValuesWFacet.java: | |
8599 Changed constructor to get description (which is then already be translated) | |
8600 dynamically, adjust deepCopy. | |
8601 | |
8602 * src/main/java/de/intevation/flys/states/StaticState.java: | |
8603 Adjust constructor accordingly. | |
8604 | |
8605 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8606 | |
8607 Add sceleton for CrossSection outs. | |
8608 | |
8609 * doc/conf/artifacts/winfo.xml: | |
8610 Added new output mode to respective state of winfo artifact configuration. | |
8611 | |
8612 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8613 Add new Dummy-Facet in state. | |
8614 | |
8615 * doc/conf/conf.xml: | |
8616 Registered new OutputGenerator. | |
8617 | |
8618 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8619 Added new CROSS_SECTION type. | |
8620 | |
8621 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8622 New, stubby skeleton for an CrossSectionGenerator. | |
8623 | |
8624 * src/main/resources/messages_de_DE.properties, | |
8625 src/main/resources/messages_de.properties, | |
8626 src/main/resources/messages_en.properties, | |
8627 src/main/resources/messages.properties: | |
8628 Added cross_section translation, also cleanups (e.g. main values). | |
8629 | |
8630 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8631 | |
8632 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Marked | |
8633 required parameters with a comment. | |
8634 | |
8635 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8636 Export floodplains (german 'Talaue') to shapefile and write its file | |
8637 path into the WSPLGEN job. | |
8638 | |
8639 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8640 | |
8641 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8642 Search for a DGM that fits to the current river and km range and write | |
8643 its file path into the WSPLGEN job. | |
8644 | |
8645 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8646 | |
8647 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Improved | |
8648 exception handling: exceptions are catched in GeometryUtils now. | |
8649 | |
8650 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8651 Write river axis and crosssections to shapefiles and save shapefile | |
8652 pathes in WSPLGENJob. | |
8653 | |
8654 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8655 | |
8656 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8657 Use the coorect SRID for reading GeoJSON and writing line/polygon | |
8658 shapefiles. | |
8659 | |
8660 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Use a | |
8661 concrete coordinate system while feature type creation. | |
8662 | |
8663 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8664 | |
8665 * pom.xml: Added GeoTools 2.7.2 dependencies for Shapefile, GeoJSON and | |
8666 EPSG support. | |
8667 | |
8668 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Store | |
8669 'LIN' parameter in a list now. A WSPLGEN parameter might contain many | |
8670 LINs. | |
8671 | |
8672 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New functions | |
8673 to create FeatureTypes and to write shapefiles. | |
8674 | |
8675 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8676 Write user specified barriers into a shapefile placed in the artifact | |
8677 directory. | |
8678 | |
8679 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8680 | |
8681 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
8682 that extracts the SRID defined in the global configuration file for a | |
8683 given river. | |
8684 | |
8685 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
8686 Removed the code that extracts the river SRID - use FLYSUtils instead. | |
8687 | |
8688 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8689 | |
8690 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8691 | |
8692 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
8693 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8694 | |
8695 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8696 | |
8697 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8698 | |
8699 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
8700 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8701 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
8702 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
8703 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
8704 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8705 | |
8706 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8707 | |
8708 Commit accidentally omitted result of refactoring (WINFO/FLYSUtils/getRiver). | |
8709 | |
8710 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8711 Removed implementations of getRiver, update calls to use FLYSUtils. | |
8712 | |
8713 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8714 | |
8715 Interpolate Q main values, generate interpolated W main values on the fly from | |
8716 Q main values. | |
8717 | |
8718 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8719 (getGaugeDatum): removed, obsolete | |
8720 (getLocation): new, gets location | |
8721 Use WstValueTable to look up interpolated Qs of MainValues. In absence of | |
8722 the same functionality for Ws, generate W Main Values from Q Main Values. | |
8723 | |
8724 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8725 | |
8726 Use new helper class FLYSUtils, minor refactorization. | |
8727 | |
8728 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8729 Use new functionality of helper class, convenience of FLYSArtifact. | |
8730 | |
8731 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8732 | |
8733 Refactored to use new Helper class FLYSUtils, moved getRiver-functionality | |
8734 in there. | |
8735 | |
8736 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getRiver): | |
8737 New function to retrieve river of an artifact, slightly modified from | |
8738 WINFOArtifact. | |
8739 | |
8740 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8741 Removed implementations of getRiver, update calls to use FLYSUtils. | |
8742 | |
8743 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8744 | |
8745 Minor cosmetics. | |
8746 | |
8747 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8748 Resolved a TODO. | |
8749 | |
8750 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
8751 Added some documentation. | |
8752 | |
8753 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
8754 Minor cosmetic. | |
8755 | |
8756 2011-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8757 | |
8758 * doc/conf/meta-data.xml: Made it Oracle compatible. | |
8759 | |
8760 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
8761 If running in debug mode log executed statements. | |
8762 Helps debugging Oracle connections. | |
8763 | |
8764 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8765 | |
8766 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8767 Set some WSPLGENJob parameters which are stored at FLYSArtifact. | |
8768 | |
8769 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8770 | |
8771 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New. This helper | |
8772 class should provide some basic FLYS stuff. Currently, there are functions | |
8773 that return the km range/location. | |
8774 | |
8775 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
8776 the methods that return the km range/locations. This is implemented in | |
8777 FLYSUtils now. | |
8778 | |
8779 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8780 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8781 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Adapted | |
8782 the WINFO method calls to retrieve the km range/locations - call | |
8783 FLYSUtils now. | |
8784 | |
8785 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8786 | |
8787 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New method | |
8788 to destroy a single state. | |
8789 | |
8790 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8791 | |
8792 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8793 Cosmetic, remove debug output and comments, minor style adjustments. | |
8794 | |
8795 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8796 | |
8797 Added limited themeing-support for MainValues. | |
8798 | |
8799 * doc/conf/themes.xml: | |
8800 Added Q/W-MainValues themes. | |
8801 | |
8802 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8803 Added limited theming support, add legend entry for main values. | |
8804 | |
8805 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8806 | |
8807 * doc/conf/conf.xml: Added a configuration node that points to the directory | |
8808 where shapefiles should be stored in. | |
8809 | |
8810 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: New. | |
8811 This class is used to save/write the parameter for a WSPLGEN calculation. | |
8812 WSPLGEN's *.par files are written using the toFile() method. | |
8813 | |
8814 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8815 A directory for all WSPLGEN stuff is created in computeAdvance() - those | |
8816 directory and all its contained files are removed in endOfLife(). | |
8817 | |
8818 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8819 | |
8820 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
8821 New Util to work with theme-related stuff. | |
8822 | |
8823 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8824 | |
8825 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8826 Use NamedDoubles instead of MainValues, try to adjust scale of Ws. | |
8827 | |
8828 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8829 Use NamedDoubles instead of MainValues, generalize annotation handling, to | |
8830 allow easier reusability and themeing. | |
8831 | |
8832 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8833 Added convenience constructor, exemplary switch on bordered text. | |
8834 | |
8835 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8836 | |
8837 * doc/conf/meta-data.xml: | |
8838 Recommend MainValues for Computed discharge curves. | |
8839 | |
8840 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8841 | |
8842 New NamedDouble class which implements a <String,double>-pair. | |
8843 | |
8844 * src/main/java/de/intevation/flys/artifacts/model/NamedDouble.java: | |
8845 New, implementation of a double with a string or vice versa. | |
8846 | |
8847 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8848 | |
8849 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
8850 State.endOfLife() for all States when endOfLife() of the Artifact is | |
8851 called. | |
8852 | |
8853 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8854 | |
8855 Also plot "W"-MainValues (on vertical axis), take correct parameters, but | |
8856 do not convert to correct scale (cm vs NN+m). | |
8857 | |
8858 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8859 Naive attempt at allowing the vertical axis to be sticked at. | |
8860 | |
8861 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8862 Store Q and W MainValues separately, add them to plot as annotations. | |
8863 | |
8864 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8865 Serve the MainValues, parameterized on river and location, Q and W. | |
8866 Removed Facet-implementation. | |
8867 | |
8868 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8869 Updated Facet Types. | |
8870 | |
8871 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: | |
8872 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
8873 New, trivial facets, extracted from MainValuesArtifact. | |
8874 | |
8875 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8876 | |
8877 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
8878 State.endOfLife() of each State that is no longer in the queue of the | |
8879 artifact when this artifact steps back to a previous state. | |
8880 | |
8881 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8882 | |
8883 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8884 Plot MainValues delivered by MainValuesFacet in much the same ways than | |
8885 Annotations in LongitudinalSection plots. | |
8886 | |
8887 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8888 | |
8889 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8890 Prepare further differentiation between Annotations that stick to X or Y- | |
8891 Axis, copied some positioning logic into StickyAxisAnnotation | |
8892 implementation. | |
8893 | |
8894 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8895 | |
8896 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8897 Minor cosmetics. | |
8898 | |
8899 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8900 | |
8901 Added MainValue-Fetching-Capabilities to MainValuesArtifact. | |
8902 | |
8903 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8904 (initialize, getMinValues): | |
8905 Let MainValuesArtifact return "real" MainValues, although ignorant of all | |
8906 parameterization. | |
8907 | |
8908 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8909 | |
8910 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8911 (MainValueFacet): | |
8912 Improved and straightened implementation, added code-Annotations and Todos. | |
8913 | |
8914 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8915 | |
8916 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8917 (MainValueFacet): | |
8918 Improved and straightened implementation, added code-Annotations and Todos. | |
8919 | |
8920 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8921 | |
8922 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8923 (getState): | |
8924 Resolved multiple creation of state (yet not very clean). | |
8925 | |
8926 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8927 | |
8928 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
8929 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8930 Cosmetics, docs. | |
8931 | |
8932 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8933 Cosmetics. | |
8934 | |
8935 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8936 | |
8937 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8938 Added new (MainValues) Facet-Type. | |
8939 | |
8940 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8941 | |
8942 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
8943 Added a method that returns a River object based on its database id. | |
8944 | |
8945 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: The | |
8946 data that is required for this artifact is fetched from database instead | |
8947 from a Master-Artifact. The creation of static artifacts should use | |
8948 database ids instead of cloning a Master-Artifact. | |
8949 | |
8950 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8951 | |
8952 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8953 Removed needless imports. | |
8954 | |
8955 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8956 | |
8957 Added configuration for factory and rule for MainValueArtifacts. | |
8958 | |
8959 * doc/conf.xml: | |
8960 Add a mainvalue factory to serve MainValueArtifacts. | |
8961 | |
8962 * doc/conf/meta-data.xml: | |
8963 Recomment mainvalue artifact when computed_discharge_curve can be put out. | |
8964 | |
8965 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8966 | |
8967 Let MainValuesArtifact have a state, outputmode and facet. | |
8968 | |
8969 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
8970 New, a non-abstract DefaultState. | |
8971 | |
8972 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8973 Progressed with implementation, use StaticState to hook output modes and | |
8974 facet in; use (Static)FLYSArtifact implementation. | |
8975 | |
8976 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8977 | |
8978 Smaller cosmetics. | |
8979 | |
8980 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
8981 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
8982 Cosmetics in comments. | |
8983 | |
8984 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8985 Added @Override annotations. | |
8986 | |
8987 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
8988 Use brackets to improve readability of ternary operator. | |
8989 | |
8990 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8991 | |
8992 * doc/conf/meta-data.xml: Use "ids" in user specific part, too. | |
8993 | |
8994 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8995 | |
8996 * doc/conf/meta-data.xml: s/db-ids/ids/g to unify system and user specific | |
8997 loading. | |
8998 | |
8999 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9000 | |
9001 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9002 Extracted access to state and states in order to have fewer places to | |
9003 modify when going for single/trivial state- artifacts. | |
9004 | |
9005 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
9006 | |
9007 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
9008 Append the river's srid to the WMSLayerFacet. | |
9009 | |
9010 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9011 | |
9012 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
9013 Minor fixes, ressurect Facet implementation as inner class. | |
9014 | |
9015 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
9016 | |
9017 * doc/conf/artifacts/winfo.xml: Moved the input of barriers one state | |
9018 earlier where the scenario is selected as well. | |
9019 | |
9020 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
9021 This state now desires the "map_digitize" UI provider and returns both | |
9022 items "scenario" and "uesk.barriers" in the dynamic describe part. | |
9023 | |
9024 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
9025 Removed the UI provider and the computeFeed() which is no longer needed, | |
9026 because there is no more user input in this state. | |
9027 | |
9028 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
9029 | |
9030 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
9031 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
9032 Repaired broken xpath expressions (the config changed in one of the last | |
9033 commits) and make use of the variable support in xpath expressions to | |
9034 replace the rivername. | |
9035 | |
9036 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
9037 Save the rivername while initializing this artifact. This is now | |
9038 necessary, because each river can have its own background wms | |
9039 configured. | |
9040 | |
9041 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
9042 | |
9043 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
9044 Repaired broken river-wms initialization. | |
9045 | |
9046 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9047 | |
9048 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java, | |
9049 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
9050 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
9051 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java, | |
9052 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
9053 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
9054 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, | |
9055 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
9056 src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
9057 Made facets cloneable with the right type. | |
9058 | |
9059 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, | |
9060 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
9061 Removed superfluous imports. | |
9062 | |
9063 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
9064 | |
9065 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9066 Declare the first artifact of an output as master artifact (artifacts | |
9067 are ordered by their creation time). | |
9068 | |
9069 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9070 | |
9071 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
9072 Removed facet interface. | |
9073 | |
9074 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9075 Make artifacts cloneable. TODO: Override deepCopy() in subclassed | |
9076 states and facets. | |
9077 | |
9078 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
9079 | |
9080 * doc/conf/conf.xml: Added the MapInfoService and adapted the floodmap | |
9081 configuration. Now, each river can have its own background wms layer | |
9082 defined. | |
9083 | |
9084 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
9085 New. This service returns some basic information used to create maps for | |
9086 a specific river. The name of the desired river needs to be defined at | |
9087 "/mapinfo/river/text()". | |
9088 | |
9089 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
9090 Adapted an xpath expression that points to the srid of a river in the | |
9091 floodmap configuration (which changed). | |
9092 | |
9093 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9094 | |
9095 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9096 Build out/facet filter from XML document passed at creation time. | |
9097 | |
9098 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9099 | |
9100 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9101 Added some code to filter outs/facets by an optional positive list. | |
9102 This is needed to only expose parts of the facets. This | |
9103 is needed for artifacts which are loaded into a collection. | |
9104 TODO: create the filter from the XML document passed at creation | |
9105 time. | |
9106 | |
9107 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9108 | |
9109 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved all | |
9110 WINFO specific code to WINFOArtifact. FLYSArtifact is now only revolving | |
9111 about state affairs. | |
9112 | |
9113 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-inserted | |
9114 the specific stuff here. | |
9115 | |
9116 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
9117 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
9118 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
9119 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
9120 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
9121 src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
9122 Adjusted the casts. | |
9123 | |
9124 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9125 | |
9126 * doc/conf/meta-data.xml: Filter by outs in user template part. | |
9127 | |
9128 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
9129 | |
9130 * doc/conf/artifacts/winfo.xml: Defined an input value for the GeoJSON | |
9131 string to save user defined barriers in the map. | |
9132 | |
9133 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
9134 Added a computeFeed() method. In addition, this state now prefers the | |
9135 "noinput" UI provider. | |
9136 | |
9137 2011-08-19 Ingo Weinzierl <ingo@intevation.de> | |
9138 | |
9139 * doc/conf/conf.xml: Each river requires a SRID definition. This | |
9140 definition is used to transform the river's geometries into the desired | |
9141 projection. | |
9142 | |
9143 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
9144 This facets are able to save a SRID. | |
9145 | |
9146 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
9147 The extent that is written into the WMSLayerFacet is determined by the | |
9148 boundary of the geometry. | |
9149 | |
9150 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New. A | |
9151 utility class that provides helper functions for geometries. Currently, | |
9152 one function is defined, that creates a boundary string for OpenLayers. | |
9153 | |
9154 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9155 | |
9156 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
9157 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
9158 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
9159 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
9160 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
9161 src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
9162 Removed superfluous imports. | |
9163 | |
9164 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9165 | |
9166 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
9167 Removed CallContext from state validation. It is not needed and hindered | |
9168 the extraction of all out of an artifact if you don't have a | |
9169 call context (like initial scan of datacage database). | |
9170 | |
9171 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9172 Extract all outs now. | |
9173 | |
9174 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
9175 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9176 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
9177 src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
9178 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
9179 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
9180 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
9181 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
9182 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
9183 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
9184 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
9185 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
9186 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
9187 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
9188 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
9189 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
9190 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
9191 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9192 Adjusted calls. | |
9193 | |
9194 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9195 | |
9196 * src/main/resources/messages.properties, | |
9197 src/main/resources/messages_de_DE.properties, | |
9198 src/main/resources/messages_en.properties, | |
9199 src/main/resources/messages_de.properties: | |
9200 Added lacalization of "Streckenfavoriten". | |
9201 | |
9202 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9203 | |
9204 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
9205 Picky white-space cosmetics. | |
9206 | |
9207 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9208 | |
9209 Added stub implementation of new MainValuesArtifact. | |
9210 | |
9211 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
9212 New. Stub implementation for new MainValuesArtifact. | |
9213 | |
9214 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9215 | |
9216 Fixed flys/issue262 | |
9217 | |
9218 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9219 Unified user and system tempate. | |
9220 Looks for "/artifact-database/metadata/template/text()" | |
9221 in conf.xml. Defaults to "${artifacts.config.dir}/meta-data.xml". If user id is | |
9222 given its the default connection for contexts. | |
9223 | |
9224 * doc/conf/conf.xml: Adjusted | |
9225 * doc/conf/meta-data-system.xml, doc/conf/meta-data-user.xml: Deleted. | |
9226 * doc/conf/meta-data.xml: Unified version of user and system template. | |
9227 | |
9228 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
9229 Adjusted the test program. | |
9230 | |
9231 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9232 | |
9233 Fixed flys/issue260 | |
9234 | |
9235 * doc/conf/meta-data-user.xml: Uses master_artifacts view now. | |
9236 | |
9237 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9238 | |
9239 * doc/conf/datacage.sql: Added view master_artifacts to select | |
9240 the master artifacts of the collections more easily. | |
9241 To upgrade existing database: | |
9242 | |
9243 CREATE VIEW master_artifacts AS | |
9244 SELECT a2.id AS id, | |
9245 a2.gid AS gid, | |
9246 a2.state AS state, | |
9247 a2.creation AS creation, | |
9248 ci2.collection_id AS collection_id | |
9249 FROM collection_items ci2 | |
9250 JOIN artifacts a2 | |
9251 ON ci2.artifact_id = a2.id | |
9252 JOIN (SELECT ci.collection_id AS c_id, | |
9253 MIN(a.creation) AS oldest_a | |
9254 FROM collection_items ci | |
9255 JOIN artifacts a | |
9256 ON ci.artifact_id = a.id | |
9257 GROUP BY ci.collection_id) o | |
9258 ON o.c_id = ci2.collection_id | |
9259 WHERE a2.creation = o.oldest_a; | |
9260 | |
9261 TODO: Use the view in the templates. | |
9262 | |
9263 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9264 | |
9265 * doc/conf/meta-data-user.xml: Removed state filter because it was broken. | |
9266 Simplified by joining two contexts. | |
9267 | |
9268 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9269 | |
9270 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
9271 Fix issues with lines of annotation when zoomed (wrong scale used). | |
9272 | |
9273 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9274 | |
9275 Added legend for annotations to LongitudinalSectionDiagram. | |
9276 | |
9277 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9278 Added a pseudo-dataseries/collection to employ existing infrastructure for | |
9279 displaying localized label for Annotations (yet unthemed). | |
9280 | |
9281 * src/main/resources/messages.properties, | |
9282 src/main/resources/messages_de_DE.properties, | |
9283 src/main/resources/messages_en.properties, | |
9284 src/main/resources/messages_de.properties: | |
9285 Made label-string available for localization. | |
9286 | |
9287 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9288 | |
9289 Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . | |
9290 | |
9291 * src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
9292 Deleted/moved to src/main/java/de/intevation/flys/jfree/ . | |
9293 | |
9294 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
9295 New/moved from src/main/java/de/intevation/flys/export/ , adjusted | |
9296 package statement, made class public. | |
9297 | |
9298 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9299 Added import statement for de.intevation.flys.jfree.StickyAxisAnnotation . | |
9300 | |
9301 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9302 | |
9303 Extracted and renamed CustomAnnotation to StickyAxisAnnotation. Also removed | |
9304 needless imports. | |
9305 | |
9306 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
9307 src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
9308 Extracted class implementation CustomAnnotation and renamed to | |
9309 StickyAxisAnnotation. | |
9310 | |
9311 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9312 | |
9313 Improved CustomAnnotations and rendering thereof, now including an | |
9314 "axis mark" (little line at axis), also prepared possibility to put | |
9315 annotations on Y-axis. | |
9316 | |
9317 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9318 Improved CustomAnnotation to include marks on the axis and better spacing | |
9319 from it. | |
9320 | |
9321 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9322 | |
9323 Implemented proof-of-concept collision-detection when drawing | |
9324 CustomAnnotations (text only). | |
9325 | |
9326 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
9327 Pass a fresh ChartRenderingInfo-Object to createBufferedImage, such that | |
9328 information can be collected while rendering. | |
9329 | |
9330 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9331 Exploit the fact that XYTextAnnotation already registers drawn shape in the | |
9332 ChartRenderingInfo if it exists and either an URL or tooltip is set. | |
9333 Before drawing, calculate own shape and compare against already registered | |
9334 shapes. | |
9335 | |
9336 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9337 | |
9338 Implemented (yet dummy) custom Annotation class. | |
9339 | |
9340 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9341 Added implementation of yet dummy CustomAnnotation class. | |
9342 | |
9343 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9344 | |
9345 Slightly improved rendering of annotations. | |
9346 | |
9347 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9348 Slightly improved rendering of annotations. Still no valid collision | |
9349 detection. Annotations are drawn every 2 km; first come first serve. | |
9350 | |
9351 2011-08-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9352 | |
9353 Fix for flys/issue191 | |
9354 | |
9355 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(longestIncreasingWRangeIndices): | |
9356 Added a method to find the longest index range with increasing w values. | |
9357 | |
9358 * src/main/java/de/intevation/flys/exports/ATWriter.java: Export the longest | |
9359 range of monotone increasing w values instead of the first one. | |
9360 TODO: The first line of the export is still broken. | |
9361 | |
9362 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
9363 Removed superfluous import. | |
9364 | |
9365 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9366 | |
9367 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
9368 Resolved two TODOs: get Annotations of selected River, get "point" | |
9369 Annotations only. | |
9370 | |
9371 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9372 | |
9373 Added functionality to query range and point-annotations only to | |
9374 AnnotationFactory. | |
9375 | |
9376 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java | |
9377 (getPointAnnotations, getAnnotationsBreadth): | |
9378 New functions to query breadth and point-only annotations. | |
9379 | |
9380 2011-08-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9381 | |
9382 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9383 Added a development mode for recommendations. Enabled with | |
9384 stetting system property 'flys.datacage.recommendations.development' to true. | |
9385 When set the XML template are re-read if the timestamps of the | |
9386 files have changed so you do not have to restart the server again and again. | |
9387 | |
9388 * doc/conf/meta-data-user.xml: Sort collections by creation time in descending order. | |
9389 | |
9390 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9391 | |
9392 Rather picky cosmetics only. | |
9393 | |
9394 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
9395 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
9396 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
9397 src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java, | |
9398 src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
9399 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
9400 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
9401 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9402 End comments on a full stop, separate from closing '*/' by whitespace, | |
9403 adjusted javadoc comments. | |
9404 | |
9405 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9406 | |
9407 Made Annotations visible in LongitudinalSection diagrams. | |
9408 | |
9409 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, | |
9410 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
9411 Register new Facet Type, let LongitudinalSectionGenerator include | |
9412 Annotations in diagram (yet unfiltered and independent of river). | |
9413 | |
9414 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9415 | |
9416 * doc/conf/conf.xml, | |
9417 doc/conf/artifacts/annotation.xml, | |
9418 doc/conf/meta-data-system.xml: | |
9419 Added configuration for AnnotationArtifacts. | |
9420 | |
9421 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9422 | |
9423 Added demo- implementation of a AnnotationArtifact and its Facet. | |
9424 | |
9425 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
9426 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
9427 src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: | |
9428 New. Initial version of an AnnotationArtifact and its State and Facet. | |
9429 | |
9430 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9431 | |
9432 * doc/conf/datacage.sql: Extended schema for artifacts and collections | |
9433 to have creation times, too. | |
9434 | |
9435 To update existing databases: | |
9436 | |
9437 ALTER TABLE artifacts ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
9438 ALTER TABLE collections ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
9439 | |
9440 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9441 Store creation times for artifacts and collections, too. | |
9442 | |
9443 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9444 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9445 Adjusted SQL statements. | |
9446 | |
9447 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9448 | |
9449 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9450 Make it compilable again (BackendListener interface changed). | |
9451 | |
9452 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9453 | |
9454 * doc/conf/meta-data-user.xml: Added grouping element around w/q of each | |
9455 longitudinal section artifact. | |
9456 | |
9457 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java, | |
9458 src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java: | |
9459 Added some debugging capabilities. | |
9460 | |
9461 * src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
9462 Added isEmpty() method. | |
9463 | |
9464 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9465 Now it is possible to nest <dc:elements> into other elements in the <dc:context> | |
9466 body. This is useful and needed for grouping and repeating results. | |
9467 | |
9468 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9469 | |
9470 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9471 User connection was cached, system was not. Lead to incorrect results. | |
9472 | |
9473 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9474 | |
9475 * doc/conf/meta-data-user.xml: Added <old_calculations> element | |
9476 around old calculations. | |
9477 | |
9478 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9479 | |
9480 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
9481 Cosmetic: Replaced usage of legacy java.util.Stack with java.util.Deque. | |
9482 | |
9483 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9484 | |
9485 * doc/conf/meta-data-user.xml: Use 'CAST(x AS uuid)' instead of 'x::uuid' | |
9486 to be more compatible. | |
9487 | |
9488 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9489 | |
9490 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9491 If given an artifact place its identifier into parameters passed to template. | |
9492 Fixed swapped user/system connections if using the user template. | |
9493 | |
9494 * doc/conf/meta-data-user.xml: Recommend w/q facet from old calculations | |
9495 if an artifact was given that represents a longitudinal section | |
9496 "Laengsschnitt". | |
9497 | |
9498 TODO I: The template uses PostgreSQL specific UUID casts. | |
9499 TODO II: We need to find a way only to recommend the master artifacts. | |
9500 | |
9501 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9502 | |
9503 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9504 Added a <dc:comment> tag to place comments in the meta data templates. | |
9505 <!-- ... --> comments are copied through. | |
9506 | |
9507 * doc/conf/meta-data-user.xml: Added a simple test. | |
9508 | |
9509 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9510 | |
9511 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9512 Be a bit more tolerant about empty strings for UUIDs of artifact and user. | |
9513 | |
9514 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9515 | |
9516 Bring user specific meta data service to life. | |
9517 | |
9518 * doc/conf/conf.xml: There are now two templates to configure: | |
9519 The system template (only the data from the backend) and the | |
9520 user template (the datcage db and the backend db), | |
9521 | |
9522 * doc/conf/meta-data-template.xml: Deleted. | |
9523 * doc/conf/meta-data-user.xml: New. The user specific template. TODO: Write it! | |
9524 * doc/conf/meta-data-system.xml: New. The system template. | |
9525 | |
9526 * src/main/java/de/intevation/flys/artifacts/datacage/templating/NoneUserSpecific.java: | |
9527 Deleted. | |
9528 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9529 New. The logic to fill the templates. | |
9530 | |
9531 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
9532 Adjusted to follow the new call signatures. | |
9533 | |
9534 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9535 Refactored. Removed the old code and only leave the new service. Following | |
9536 XPaths are evaluated on the incomming document: | |
9537 | |
9538 "/art:meta/art:artifact-id/@value" The UUID of the artifact. Optional. | |
9539 Used to fill the template enviroment. | |
9540 "/art:meta/art:user-id/@value" The UUID of the user. Optional. | |
9541 If given the user specific template is filled. | |
9542 "/art:meta/art:outs/@value" The list of outs used to recommend for the | |
9543 various outputs. | |
9544 "/art:meta/art:parameters/@value" A list of key/value pairs to inject more | |
9545 filters to the templating. | |
9546 | |
9547 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
9548 Change to follow the new recommendations semantics. | |
9549 | |
9550 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9551 Added symbolic constants to distinguish "user" and "system" db connections. | |
9552 | |
9553 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9554 | |
9555 * doc/conf/conf.xml: | |
9556 Cosmetics, let comments start with a capital and end on a full stop, | |
9557 removed incorrect comment. | |
9558 | |
9559 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9560 | |
9561 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9562 Cosmetics, let comments start with a capital and end on a full stop. | |
9563 | |
9564 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9565 | |
9566 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java(extractOutputNames): | |
9567 Fixed potential NPE. | |
9568 | |
9569 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9570 | |
9571 Added support for more than one db connection in datacage templating. | |
9572 | |
9573 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9574 Now you can pass a list of named db connections to the build process. | |
9575 The purpose is to mix more then one database (e.g. the backend db and | |
9576 the user specific one). | |
9577 | |
9578 To use this feature you can add an "connection" attribute | |
9579 to <dc:context> with the name of the connection to use. | |
9580 If no connection name is given the last used is used again. | |
9581 Initially the first connection in the given list is used. | |
9582 If the context is left the connection that was active before | |
9583 will be active again in a stacking manner. | |
9584 | |
9585 When creating NamedConnection objects you can set a boolean flag | |
9586 if the results coming from the connection should be cached. This | |
9587 is useful e.g. for the user specific database which runs in-memory | |
9588 so caching would introduce some superfluous overhead. | |
9589 | |
9590 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
9591 When executing the queries explicitly pass if caching should be used. | |
9592 | |
9593 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9594 | |
9595 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9596 Forgot to fetch dialect dependent SQL statement for deleting | |
9597 artifacts by uuid. | |
9598 | |
9599 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9600 | |
9601 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9602 Set the name of the collections at initial scan, too. | |
9603 | |
9604 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9605 | |
9606 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9607 Fixed wrong SQL references. | |
9608 | |
9609 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9610 | |
9611 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9612 Fixed two NPEs. | |
9613 | |
9614 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9615 | |
9616 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java, | |
9617 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9618 Forwarded kill collections and artifacts events to datacage. | |
9619 | |
9620 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9621 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9622 Added statement to delete artifact by uuid. | |
9623 | |
9624 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9625 | |
9626 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9627 Made it compilable again. The signature of BackendListener has changed. | |
9628 | |
9629 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9630 | |
9631 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9632 Completed the backend listener stuff. | |
9633 | |
9634 TODO I: Added some cleanup for orphaned artifacts. | |
9635 TODO II: Figure out a way to delete collections/artifacts | |
9636 which are delete from backend without the | |
9637 backend API. | |
9638 | |
9639 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9640 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9641 Added needed statements. | |
9642 | |
9643 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9644 | |
9645 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9646 Update collection names on change. Remove artifacts from collections. | |
9647 | |
9648 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9649 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9650 Added needed statements. | |
9651 | |
9652 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9653 | |
9654 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9655 Call datacage with the global context. This is needed to access the state engine. | |
9656 | |
9657 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: Changed | |
9658 signatures to take the global context, too. Create artifacts via backend listener | |
9659 interface. | |
9660 | |
9661 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9662 | |
9663 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9664 Fixed recursion bug. | |
9665 | |
9666 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9667 | |
9668 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9669 Added debug output. | |
9670 | |
9671 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9672 | |
9673 * doc/conf/conf.xml: Added backend listener for datacage. | |
9674 | |
9675 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9676 New. Proxies backend listener calls to datacage. | |
9677 | |
9678 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9679 Implements backend listener. TODO: Update the datacage database | |
9680 according the change calls. | |
9681 | |
9682 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9683 | |
9684 * src/main/java/de/intevation/flys/artifacts/services/meta, | |
9685 src/main/java/de/intevation/flys/artifacts/datacage/templating: | |
9686 Moved/renamed package to better fit the common semantics. | |
9687 DataCage.java is now call NoneUserSpecific.java to reflect the | |
9688 fact that it is the template for the user independent db | |
9689 analysis. | |
9690 | |
9691 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, | |
9692 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9693 Ajusted imports and calls. | |
9694 | |
9695 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9696 | |
9697 * doc/conf/conf.xml: For documentation purposes added a out-commented | |
9698 section with the default configuration of the datacage. | |
9699 | |
9700 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9701 | |
9702 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9703 Delete the artifacts at before initial scan, too. They are independent | |
9704 from users. Fixed problem when writing state data content. | |
9705 | |
9706 * src/main/resources/datacage-sql/org-h2-driver.properties: Added | |
9707 statement to delete the artifacts at initial scan, too. | |
9708 | |
9709 * src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9710 New. PostgreSQL version of the statements. The database scheme | |
9711 is the same as H2. Very useful for debugging. | |
9712 | |
9713 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9714 | |
9715 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9716 Added kludge for the types of artifact data. They seem to be null | |
9717 in some circumstances. Needs to be debugged! | |
9718 | |
9719 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9720 | |
9721 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
9722 Fixed default connection URL to use a namend in-mermory database. | |
9723 | |
9724 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9725 | |
9726 * doc/conf/datacage.sql: Fixed constraint. | |
9727 | |
9728 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9729 Added some debug output. | |
9730 | |
9731 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9732 | |
9733 * doc/conf/datacage.sql: Removed artifact_id from facet because there | |
9734 is a link via out_id -> outs.id: artifact_id -> artifacts to | |
9735 find the corresponding artifact. | |
9736 | |
9737 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9738 src/main/resources/datacage-sql/org-h2-driver.properties: Store | |
9739 facets of outs into datacage db at initial scan. | |
9740 | |
9741 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9742 | |
9743 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9744 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9745 Store outs of artifacts into datacage db at initial scan. | |
9746 TODO: store facets. | |
9747 | |
9748 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9749 | |
9750 * doc/conf/datacage.sql: Added 'type' column in artifacts data. | |
9751 Maybe useful for filtering. | |
9752 | |
9753 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9754 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9755 Store artifact data into db at initial scan. | |
9756 TODO: store outs and facets. | |
9757 | |
9758 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9759 | |
9760 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9761 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9762 Add artifacts into datacage db at initial scan. | |
9763 TODO: Store data, outs and facets. | |
9764 | |
9765 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9766 | |
9767 * doc/conf/datacage.sql: Fixed spelling in sequence name. | |
9768 | |
9769 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9770 src/main/resources/datacage-sql/org-h2-driver.properties: Simply add | |
9771 collection item at initial scan if artifact was stored before. | |
9772 TODO: Store new artifacts. | |
9773 | |
9774 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9775 | |
9776 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9777 src/main/resources/datacage-sql/org-h2-driver.properties: Add | |
9778 collections at initial scan. | |
9779 | |
9780 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9781 | |
9782 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9783 src/main/resources/datacage-sql/org-h2-driver.properties: Add users | |
9784 at initial scan. | |
9785 | |
9786 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9787 | |
9788 * doc/conf/datacage.sql: Using sequences for id generation now | |
9789 to make schema more compatible. | |
9790 | |
9791 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9792 | |
9793 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9794 src/main/resources/datacage-sql/org-h2-driver.properties: Clear database | |
9795 before initial scan. | |
9796 | |
9797 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9798 | |
9799 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
9800 Deleted. This stuff comes from the artifact database now. | |
9801 | |
9802 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
9803 New. The db config of the datacage database. | |
9804 | |
9805 * src/main/resources/datacage-sql/org-h2-driver.properties: New. | |
9806 The SQL statements needed for the datacage. | |
9807 | |
9808 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9809 Make use of the db config. | |
9810 | |
9811 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9812 | |
9813 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9814 New. A artifact database lifetime listener to build the initial | |
9815 index of the artifacts in database. | |
9816 | |
9817 * doc/conf/conf.xml: Added the datacage to the list of lifetime | |
9818 listeners. | |
9819 | |
9820 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9821 | |
9822 * doc/conf/datacage.sql: Added an explicit table for the outs | |
9823 of an artifact. | |
9824 | |
9825 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9826 Make the current outs of an artifact accessible only with | |
9827 the global context. | |
9828 | |
9829 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9830 | |
9831 * doc/conf/datacage.sql: Added ON DELETE CASCADE constraints. | |
9832 Added state in facet. | |
9833 | |
9834 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9835 | |
9836 * doc/conf/datacage.sql: New. H2 Schema for the datacage database. | |
9837 Uses special features like IDENTITY (autoincrement) typed columns. | |
9838 | |
9839 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
9840 Pooled connection. | |
9841 | |
9842 * pom.xml: Added dependencies to H2 and Apache DBCP. | |
9843 | |
9844 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9845 | |
9846 * src/test/java/de/intevation/flys/artifacts/AppTest.java, | |
9847 src/main/java/de/intevation/flys/artifacts/App.java: Removed. | |
9848 This the stupid "Hello, World!" app initially created by the | |
9849 maven archetype. It was never used. | |
9850 | |
9851 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9852 | |
9853 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9854 Argh! Usage the DOM was not thread safe (discovered with ab). | |
9855 | |
9856 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9857 | |
9858 * doc/conf/meta-data-template.xml: '$recommended' lead to XPath | |
9859 errors. Using "dc:contains($parameters, 'recommended')" helps. | |
9860 | |
9861 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java, | |
9862 src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
9863 Added some debugging. | |
9864 | |
9865 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9866 Added parameters as 'parameters' to parameters. Usefull to check | |
9867 for containment of variables. | |
9868 | |
9869 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9870 | |
9871 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9872 Added 'if log.isDebugEnabled() {}'. | |
9873 | |
9874 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9875 | |
9876 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9877 Made Artifact UUID optional and accept extra parameters, too. This enables | |
9878 the service to be used without an arttifact and test all filters. | |
9879 | |
9880 <art:meta xmlns:art="http://www.intevation.de/2009/artifacts"> | |
9881 <art:outs value="computed_discharge_curve,floodmap"/> | |
9882 <art:parameters value="river:Elbe"/> | |
9883 <art:filters value="recommended"/> | |
9884 </art:meta> | |
9885 | |
9886 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
9887 'contain' accept Maps and collection, too. | |
9888 | |
9889 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9890 Made artifact option (= null) in recommendations. | |
9891 | |
9892 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9893 | |
9894 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9895 Moved connection specific into inner class. The enables the reuse of the | |
9896 compiled statement. | |
9897 | |
9898 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: The | |
9899 SQL statements are now only compiled once at creation time of the builder. | |
9900 Each connection now reuses them. | |
9901 | |
9902 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9903 | |
9904 * doc/conf/cache.xml: Added configuration for static datacage db access. | |
9905 | |
9906 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: Using | |
9907 caches seems to need an explicit System.exit(). | |
9908 | |
9909 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9910 Added support for caching the SQL statements and there results. | |
9911 | |
9912 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: Some | |
9913 clean up. Reordered code for performance. Strip SQL statements more | |
9914 aggressively. | |
9915 | |
9916 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
9917 Made it Serializable. | |
9918 | |
9919 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
9920 Introduced system property 'flys.artifacts.cache.config.file' to make | |
9921 the caching configurable without pulling up the whole stack. | |
9922 | |
9923 2011-07-22 Ingo Weinzierl <ingo@intevation.de> | |
9924 | |
9925 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9926 Prepared the FLYSArtifactCollection to support the storage of already | |
9927 loaded recommendations in its attribute document. | |
9928 | |
9929 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9930 | |
9931 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9932 Adjusted to use the DataCage recommendations. The incomming document | |
9933 can pass the artifacts UUID by '/art:outs/@value' the outs as a | |
9934 comma separated list in '/art:outs/@value' and optional a set of | |
9935 filters comma separated in '/art:filters/@value'. | |
9936 | |
9937 If UUID and OUTS are not given the old service is used. This | |
9938 should be removed as soon as the client uses the new service. | |
9939 | |
9940 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9941 | |
9942 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9943 Allow '-' in variable names. | |
9944 | |
9945 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9946 | |
9947 * doc/conf/meta-data-template.xml: Now, the river-id is really added to | |
9948 the factory node of the wmsbackground layer. | |
9949 | |
9950 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9951 | |
9952 * doc/conf/meta-data-template.xml: Added the river-id to the factory node | |
9953 of the riveraxis and wmsbackground layer. | |
9954 | |
9955 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9956 | |
9957 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
9958 src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
9959 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
9960 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
9961 Adjusted to implement changed Service interface. | |
9962 | |
9963 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9964 | |
9965 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Refactored | |
9966 the method that retrieves the Outputs for the Artifact. Now, we are able | |
9967 to query the Outputs for the current state, and all outputs separately. | |
9968 | |
9969 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: The | |
9970 recommendations provided by this monitor will take the Outputs of the | |
9971 current state only into account. | |
9972 | |
9973 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9974 | |
9975 * doc/conf/meta-data-template.xml: Added conditions for each output type. | |
9976 Splitted the "floodmap" output into two parts: a recommended one and a | |
9977 complete one. The recommended part will only build the document tree for | |
9978 the recommended artifacts; the complete part will build the whole document | |
9979 tree that is available for a floodmap. | |
9980 | |
9981 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
9982 This Hook now uses the DataCage to generate the recommended artifacts. | |
9983 The output-defaults configurtion is needless now. | |
9984 | |
9985 * doc/conf/output-defaults.xml: Removed. The configuration of recommended | |
9986 artifacts takes place in meta-data-template.xml. | |
9987 | |
9988 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9989 Bugfix: the DataCage didn't start working if its builder was NOT null, | |
9990 but it shouldn't start if the builder IS null. | |
9991 | |
9992 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9993 | |
9994 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9995 Now it is possible to directly pass a Node as a root to the builder. | |
9996 The owning document if fetch by Node.getOwnerDocument(). This is | |
9997 useful if you want to generate the recommendation directly into | |
9998 an already existing document under a given node. | |
9999 | |
10000 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
10001 Changed the signature of recommend() to accept a node where to | |
10002 append the recommendations. | |
10003 | |
10004 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10005 | |
10006 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
10007 Added a macro mechanism: | |
10008 | |
10009 <dc:macro name="keine-fuenf"> | |
10010 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
10011 </dc:macro> | |
10012 <dc:call-macro name="keine-fuenf"/> | |
10013 <dc:call-macro name="keine-fuenf"/> | |
10014 <dc:call-macro name="keine-fuenf"/> | |
10015 | |
10016 Macros can be defined everywhere in the template | |
10017 with 'macro'. There bodies can contain all valid elements | |
10018 including other 'macro's and 'call-macro's. They are | |
10019 called with their 'name' with 'call-macro'. The control flow | |
10020 is continued inside the body of the called macro and | |
10021 will continue right after the calling 'call-macro' when | |
10022 the macro body is finished. | |
10023 | |
10024 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10025 | |
10026 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
10027 Added a new 'if' construct similiar to XSLT: | |
10028 | |
10029 <dc:if test="not(dc:contains($outs, '5'))"> | |
10030 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
10031 </dc:if> | |
10032 | |
10033 The control flow is continued inside the 'if' if the 'test' attribute | |
10034 as an XPath expression on an empty document evalutes to true. | |
10035 Else the inside is skipped. There is no 'else'. Use 'choose'/'otherwise' | |
10036 if you need this. | |
10037 | |
10038 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10039 | |
10040 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
10041 Added a recommend() method to generate recommendations for | |
10042 a given artifact, outs and extra parameters. | |
10043 | |
10044 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added | |
10045 method to extract all data at once. | |
10046 | |
10047 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10048 | |
10049 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
10050 New. Custom XPath function provider. Provides | |
10051 'dc:contains(Object [] haystack, Object needle)' by now. Should be | |
10052 useful to check containments in 'out' lists later. | |
10053 | |
10054 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
10055 Register the FunctionResolver to the evaluated XPaths. | |
10056 | |
10057 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
10058 Added code to parse | |
10059 "param:a,b,c" to "param" -> new String [] { "a", "b", "c" } to | |
10060 help testing the 'dc:contains' XPath function. | |
10061 | |
10062 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10063 | |
10064 * doc/conf/conf.xml: Added wms configurations for Saar, Mosel and Elbe. | |
10065 Each river supported by FLYS requires such a WMS configuration. A WMS | |
10066 should contain layers for the river axis, buildings, kilometer labels | |
10067 and maybe a background layer as well. | |
10068 | |
10069 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
10070 Added key that is used to store a map of WMS URLs - for each river a | |
10071 WMS URL. | |
10072 | |
10073 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
10074 Parse the river WMS from global configuration. | |
10075 | |
10076 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
10077 Create WMSLayerFacets with URLs based on the river and the river wms | |
10078 configuration stored in the FLYSContext. | |
10079 | |
10080 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
10081 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
10082 Adapted the initialize() signature and the method call of computeInit() | |
10083 which requires a FLYSContext to retrieve the river WMS configurations. | |
10084 | |
10085 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
10086 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
10087 Added the context object parameter to the computeInit() method. | |
10088 | |
10089 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
10090 initialize() with the context object - which is a FLYSContext or a | |
10091 CallContext. | |
10092 | |
10093 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10094 | |
10095 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
10096 Check if builder was created properly before using it. | |
10097 | |
10098 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
10099 Implements now variable provider for XPath expressions. | |
10100 | |
10101 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
10102 Added new choose/when/otherwise construct similiar to XSLT | |
10103 | |
10104 <dc:choose> | |
10105 <dc:when test="$river = 'Mosel'"> | |
10106 <dc:text>Es ist die Mosel.</dc:text> | |
10107 </dc:when> | |
10108 <dc:when test="$river = 'Saar'"> | |
10109 <dc:text>Es ist die Saar.</dc:text> | |
10110 </dc:when> | |
10111 <dc:otherwise> | |
10112 <dc:text>Es ist weder Mosel noch Saar.</dc:text> | |
10113 </dc:otherwise> | |
10114 </dc:choose> | |
10115 | |
10116 A 'choose' block can contain a list of 'when's and an optional | |
10117 'otherwise'. For each 'when' the test attribute is evaluated | |
10118 as an XPath expression on an empty document. The result of | |
10119 the evaluation is taken as a boolean value. If its value is | |
10120 true the control flow is continued inside the corresponding | |
10121 'when' and the other choose elements are not tested. | |
10122 If the value is values the testing continues with the next | |
10123 'when'. If no 'test' expression is evaluated to true, the | |
10124 control flow continues inside the 'otherwise'. If no 'otherwise' | |
10125 is given nothing happens at all. | |
10126 | |
10127 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10128 | |
10129 * doc/conf/conf.xml: Added a config section for floodmaps. Currently, the | |
10130 background layer's url and layername is defined here. | |
10131 | |
10132 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
10133 Read the background layer configuration from conf.xml. Those values are | |
10134 used to create the WMSLayerFacet. | |
10135 | |
10136 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10137 | |
10138 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
10139 The background layer facet will no longer have an extent set. | |
10140 | |
10141 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10142 | |
10143 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
10144 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
10145 Set the extent of the created WMSLayerFacets and i18n its descriptions. | |
10146 | |
10147 * src/main/resources/messages.properties, | |
10148 src/main/resources/messages_de_DE.properties, | |
10149 src/main/resources/messages_en.properties, | |
10150 src/main/resources/messages_de.properties: Added I18N strings for the | |
10151 background an river axis layer. | |
10152 | |
10153 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10154 | |
10155 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
10156 This facet type has a method to set the extent of a WMS layer. The | |
10157 extent is written to the facets XML node in toXML() as well. | |
10158 | |
10159 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10160 | |
10161 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
10162 the signature of setup() which requires a CallMeta parameter now. | |
10163 | |
10164 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
10165 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: Use | |
10166 the CallMeta object retrieved in setup() to call initialize(). It is now | |
10167 able to i18n things. | |
10168 | |
10169 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10170 | |
10171 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: New. | |
10172 Standalone app to debug the datacage template. To use in a maven environment: | |
10173 | |
10174 -Dmeta.data.template=PATH_TO_META_DATA-TEMPLATE.XML \ | |
10175 -Dmeta.data.parameters=river:Mosel \ | |
10176 -Dmeta.data.output=OUTPUT.XML \ | |
10177 -Dflys.backend.user=DB_USER \ | |
10178 -Dflys.backend.password=DB_PASSWORD \ | |
10179 -Dflys.backend.url=DB_CONNECTION_URL \ | |
10180 -Dexec.mainClass=de.intevation.flys.artifacts.services.meta.App | |
10181 | |
10182 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10183 | |
10184 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
10185 New. First step to factor out the "Datenkorb" logic into a service independent | |
10186 singleton. | |
10187 | |
10188 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
10189 Uses the "Datenkorb" singleton now. | |
10190 | |
10191 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
10192 | |
10193 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
10194 Removed "index" property, because it is already existing in parent | |
10195 class. | |
10196 | |
10197 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10198 | |
10199 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
10200 Improved error handling. | |
10201 | |
10202 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10203 | |
10204 * src/main/resources/metadata/template.xml: Deleted. | |
10205 | |
10206 * doc/conf/meta-data-template.xml: New. Was template.xml | |
10207 | |
10208 * doc/conf/conf.xml: Made meta data template configurable. | |
10209 | |
10210 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
10211 Load template from configuration not from resources. | |
10212 | |
10213 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10214 | |
10215 * src/main/resources/metadata/template.xml: s/[a-z]+-id/db-id/ | |
10216 Make database ids identifiable with unique name "db-id". | |
10217 | |
10218 2011-07-19 Ingo Weinzierl <ingo@intevation.de> | |
10219 | |
10220 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
10221 Override the toXML() method. Subclasses can now write their own XML | |
10222 representation. | |
10223 | |
10224 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
10225 New. This ManagedFacet uses an Element (DOM) to store the information | |
10226 about a facet. The intent of this facet type is to represent a facet | |
10227 stored in an Collection attribute. Different facets can have different | |
10228 attributes that we need to parse, but the only thing ManagedFacets need | |
10229 to do, is to adjust the attributes "active" and "position". So, those | |
10230 values are set directly on the Element, the other attributes aren't | |
10231 touched. | |
10232 | |
10233 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
10234 New. This facet is a wrapper for another facet. This subclass of a | |
10235 ManagedFacet overrides the toXML() method. The XML representation is | |
10236 defined by the inner facet that is stored as member variable. The | |
10237 ManagedFacet specific attributes "artifact", "facet", "pos" and "active" | |
10238 are added manually. | |
10239 | |
10240 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Uses | |
10241 the toXML() method to write a facet node into the attribute document. | |
10242 | |
10243 * src/main/java/de/intevation/flys/collections/AttributeParser.java: Uses | |
10244 the ManagedDomFacet to save the information of a facet which is | |
10245 contained in the attribute part of a Collection's DESCRIBE document. | |
10246 | |
10247 * src/main/java/de/intevation/flys/collections/OutputParser.java: Uses the | |
10248 ManagedFacetAdapter to save a facet, because we want to keep the | |
10249 specific facet to be able to write its specific XML representation into | |
10250 the Collection's DESCRIBE document. | |
10251 | |
10252 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
10253 Adapted the XPath of facets stored in the attribute part of the | |
10254 DESCRIBE. | |
10255 | |
10256 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
10257 | |
10258 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
10259 method that returns the Outputs for the Artifact. | |
10260 | |
10261 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
10262 Adapeted the call of OutputParser. | |
10263 | |
10264 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
10265 Simplified the code to read the Outputs of Artifacts. This parser will | |
10266 now longer parse the DESCRIBE documents of the Artifacts, but query the | |
10267 Outputs via FLYSArtifact.getOutputs() directly. | |
10268 | |
10269 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
10270 | |
10271 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
10272 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | |
10273 Adapted the function call of ProtocolUtils.appendOutputModes(). | |
10274 | |
10275 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
10276 Override toXML() to add the URL and layernames to the XML representation | |
10277 of this facet. | |
10278 | |
10279 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
10280 | |
10281 * doc/conf/artifacts/wmsbackground.xml, | |
10282 doc/conf/artifacts/riveraxis.xml: New configurations for an Artifact | |
10283 that is used as background layer in floodmaps, and an artifact that is | |
10284 used as layer showing the river axis in a floodmap. | |
10285 | |
10286 * doc/conf/output-defaults.xml: New file to configure default artifacts | |
10287 for specific output states. E.g. the floodmap state recommends a | |
10288 background layer and a layer displaying the river axis. In suche case, | |
10289 the floodmap state recommends two artifacts for the two layers. | |
10290 | |
10291 * doc/conf/conf.xml: Added new artifacts/artifact-factories and a Hook to | |
10292 monitor artifacts (-> CollectionMonitor.java). | |
10293 | |
10294 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
10295 New. This facet is used to represent a layer in a map. So, this facet | |
10296 stores information about a WMS URL and the layer names provided by this | |
10297 WMS. | |
10298 | |
10299 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
10300 facet types for the wmsbackground and riveraxis. | |
10301 | |
10302 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
10303 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
10304 New. An artifact and its default state. The intent of these classes is | |
10305 to generate WMSLayerFacets which represent background layers in maps. | |
10306 | |
10307 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
10308 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: New. | |
10309 An artifact and its default state. The intent of these classes is to | |
10310 generate WMSLayerFacets which represent layers that display a river | |
10311 axis. | |
10312 | |
10313 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
10314 Added the INIT ComputeType. | |
10315 | |
10316 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
10317 case for the INIT ComputeType while computing data. | |
10318 | |
10319 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
10320 | |
10321 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
10322 Added a method computeInit() which is called to initialize data/facets | |
10323 after an artifact has been created. | |
10324 | |
10325 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Repaired | |
10326 broken XPath. | |
10327 | |
10328 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
10329 | |
10330 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
10331 Removed the code to generate new artifacts. Instead of creating new | |
10332 artifacts automatically, we decided to suggest creating new artifacts | |
10333 from specific types. Therefore, the DESCRIBE document of the artifacts | |
10334 is extended with a node that contains recommended artifact types. | |
10335 | |
10336 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10337 FLYSArtifacts might be setup with the identifier of an other | |
10338 FLYSArtifact. Subclasses are able to override a method called | |
10339 initialize(Artifact, GlobalContext). This might be helpful to extract | |
10340 required values or clone artifacts. | |
10341 | |
10342 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
10343 | |
10344 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
10345 Adapted the signature of createArtifactContext() - it returns an | |
10346 instance of GlobalContext now. | |
10347 | |
10348 2011-07-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10349 | |
10350 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
10351 Debugged the water fill algorithm. Added a lot of logging. | |
10352 | |
10353 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
10354 Added a text field to give a water level to fill in. | |
10355 | |
10356 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
10357 | |
10358 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
10359 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved code | |
10360 to create the output modes based on the given facets to FLYSArtifact. In | |
10361 addition, FLYSArtifact got a new method that returns a specific input | |
10362 value as string. | |
10363 | |
10364 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: New. | |
10365 This hook monitors the "post-feed" and "post-advance". If the monitored | |
10366 Artifact's state has configured recommended artifacts, this hook will | |
10367 create new Artifacts. | |
10368 | |
10369 TODO: We have to add the UUIDs of the new Artifacts to the DESCRIBE | |
10370 document of the artifact to let the client know, that there are new | |
10371 recommended Artifacts. | |
10372 | |
10373 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: New. | |
10374 This Artifact is the base class for Artifacts, that represent static | |
10375 data. E.g. this could be a decoration theme in a chart or a background | |
10376 layer in the map. | |
10377 | |
10378 * src/main/java/de/intevation/flys/artifacts/states/OutputState.java: New. | |
10379 This state might be used as base class for states, that doesn't require | |
10380 any user input, but only provide static Facets added by a computeFeed() | |
10381 operation. So, subclasses need to implement computeFeed() only. | |
10382 | |
10383 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10384 | |
10385 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
10386 New. Standalone Swing-App to test cross sections from database without the | |
10387 hassles of our complete software stack. Runnable from a maven environment: | |
10388 | |
10389 $ mvn -e \ | |
10390 -Dflys.backend.user=DB_USER \ | |
10391 -Dflys.backend.password=DB_PASSWD \ | |
10392 -Dflys.backend.url=DB_CONNECTION_URL \ | |
10393 -Dexec.mainClass=de.intevation.flys.artifacts.charts.CrossSectionApp \ | |
10394 exec:java | |
10395 | |
10396 You can set the river to be used with the system property 'river'. | |
10397 Defaults to 'Mosel'. | |
10398 | |
10399 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
10400 Removed superfluous imports. | |
10401 | |
10402 2011-07-13 Ingo Weinzierl <ingo@intevation.de> | |
10403 | |
10404 * doc/conf/artifacts/winfo.xml: The FloodMapState has a new Outputmode | |
10405 called "floodmap" now. | |
10406 | |
10407 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: New. | |
10408 This facet is used to generate WSPLGEN results. | |
10409 | |
10410 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
10411 the WSPLGENFacet. | |
10412 | |
10413 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
10414 This state will now generate WSPLGENFacets. | |
10415 | |
10416 2011-07-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10417 | |
10418 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
10419 Fixed corner case. | |
10420 | |
10421 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10422 | |
10423 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: New. | |
10424 fillWater() generates a list of wet lines for a given profile and a | |
10425 given water level. | |
10426 | |
10427 2011-07-08 Ingo Weinzierl <ingo@intevation.de> | |
10428 | |
10429 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
10430 Outputs created while generating the DESCRIBE document will now have the | |
10431 'type' member set. | |
10432 | |
10433 * src/main/java/de/intevation/flys/collections/OutputParser.java: Read the | |
10434 'type' member from DESCRIBE document. | |
10435 | |
10436 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10437 | |
10438 * doc/conf/artifacts/winfo.xml: Removed a typo. | |
10439 | |
10440 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10441 | |
10442 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
10443 DataFacet are now able to store the ID of the state which has created | |
10444 this Facet. | |
10445 | |
10446 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10447 Initialize DataFacets with the ID of this state. This is necessary to | |
10448 renew the waterlevel data if it is no longer existing in the cache. | |
10449 | |
10450 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10451 | |
10452 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: A | |
10453 report facet can now store the state's id and the artifact's hash value | |
10454 when it has been created. | |
10455 | |
10456 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10457 Initialize the ReportFacet and WaterlevelFacet with state id and hash | |
10458 information. This has been necessary to retrieve reports and waterlevels | |
10459 in states after this one - in states that we need to enter for floodmap | |
10460 parameterization. | |
10461 | |
10462 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
10463 | |
10464 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
10465 Changed the desired UI provider. | |
10466 | |
10467 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
10468 | |
10469 * doc/conf/artifacts/winfo.xml: Added the option to continue the | |
10470 waterlevel parameterization with the intent to create flood maps. | |
10471 | |
10472 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10473 This state is no longer a final state. The user has the option to | |
10474 continue with the parameterization for flood maps based on the current | |
10475 waterlevel. Therefore, this states desires the "continue" UI provider. | |
10476 Clients should recognice this to just step to the next state or display | |
10477 a button that lets the user step to the next state manually. | |
10478 | |
10479 * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
10480 src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
10481 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
10482 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
10483 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
10484 src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
10485 New. These states are used to parameterize a further calculation type: | |
10486 flood map. | |
10487 | |
10488 * src/main/resources/messages.properties, | |
10489 src/main/resources/messages_de_DE.properties, | |
10490 src/main/resources/messages_en.properties, | |
10491 src/main/resources/messages_de.properties: Required strings for the | |
10492 flood maps states. | |
10493 | |
10494 2011-07-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10495 | |
10496 Fix(?) for flys/issue114 | |
10497 | |
10498 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10499 Make guessing a bit more robust. | |
10500 | |
10501 2011-07-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10502 | |
10503 Added the math needed to calculate "W-Differenzen" in "Laengsschnitten". | |
10504 Needs testing! | |
10505 | |
10506 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
10507 Made it an interface to be usable in more than one inheritance chain. | |
10508 | |
10509 * src/main/java/de/intevation/flys/artifacts/model/NamedObjectImpl.java: | |
10510 Implements the NamedObject interface and is the new base class of | |
10511 WQ and WKmsImpl. | |
10512 | |
10513 * src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
10514 New. Interface to associate kms with ws. | |
10515 | |
10516 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
10517 Changed the base class to NamedObjectImpl. Renamed getKms(int) | |
10518 to getKm(int) to make clear it return a single scalar value | |
10519 and fullfil the WKms interface. | |
10520 | |
10521 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
10522 New. Implements the WKms interface. Intended to be a lightweight | |
10523 datastore for "zusaetzliche Laengsschnitte" and as results | |
10524 of the WKmsOperations. | |
10525 | |
10526 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10527 Changed base class to NamedObjectImpl. | |
10528 | |
10529 * src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java: | |
10530 New. Operations on WKms data. | |
10531 Currently only the SUBTRACTION operation is implemented. This | |
10532 one is needed to calculate the "W-Differenzen". The operation | |
10533 is insensitive about the km directions of the datasets. Missing | |
10534 values are interpolated linear. | |
10535 | |
10536 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10537 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10538 Adjusted to satisfy the signature change of WQKMs. | |
10539 | |
10540 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10541 | |
10542 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: New. This | |
10543 XYSeries stores the style information that should be used to render this | |
10544 series. These information are stored as raw XML documents. A public | |
10545 method can be used to apply those style information to a | |
10546 XYLineAndShapeRenderer. | |
10547 | |
10548 Note: The only two attributes currently supported by StyledXYSeries | |
10549 items are "linesize" and "linecolor". | |
10550 | |
10551 * doc/conf/themes.xml: Added some more basic themes for the four | |
10552 calculation methods. | |
10553 | |
10554 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: This | |
10555 generator now tries to apply themes for all series contained in the | |
10556 chart. If a series is no instance of StyledXYSeries, the default | |
10557 renderer is used. | |
10558 | |
10559 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10560 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
10561 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10562 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
10563 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10564 Removed the code that had been introduced to adapt renderers statically. | |
10565 Now, each of these concrete ChartGenerators instantiates StyledXYSeries | |
10566 items to put the curves into the chart. Those items contain style | |
10567 information now! | |
10568 | |
10569 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10570 | |
10571 flys/issue135 (Diagramm: Trotz abgeschalteter Themen bleiben Beschriftungen bestehen) | |
10572 | |
10573 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The way | |
10574 to store datasets has changed. Until this revision, the concrete | |
10575 generators managed their own datasets. E.g. the | |
10576 DischargeLongitudinalSectionGenerator had three datasets: w, q and | |
10577 corrected w. Now, there are just two datasets, managed by this base | |
10578 generator - one dataset for the first Y axis and one dataset for the | |
10579 second Y axis. This makes it easier to remove axes, that have no data to | |
10580 be displayed. All concrete chart generators have to add their XYSeries | |
10581 using two methods: addFirstAxisSeries() and addSecondAxisSeries(). | |
10582 | |
10583 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10584 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
10585 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10586 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
10587 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10588 Those concrete chart generators no longer manage datasets themself but | |
10589 they use the two methods described above, to plot the data to the first | |
10590 or second Y axis. | |
10591 | |
10592 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10593 | |
10594 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
10595 Added the option to use a filter to reduce the number of items returned | |
10596 by this service. | |
10597 | |
10598 2011-06-30 Ingo Weinzierl <ingo@intevation.de> | |
10599 | |
10600 flys/issue159 (WINFO: Radiobutton - Ortsauswahl bei "W für ungleichwertigen Abflusslängsschnitt" entfernen) | |
10601 | |
10602 * doc/conf/artifacts/winfo.xml: Changed the kilometer range input for | |
10603 calculation 4. This calculation type requires a kilometer range. So, | |
10604 after choosing the calculation 4, the transition model leads to a state | |
10605 that just allows the input of a kilometer range with no option to | |
10606 enter locations. | |
10607 | |
10608 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
10609 New. A base state for the kilometer selection for calculations. The | |
10610 target of this state is to provide facets for the duration curves. | |
10611 | |
10612 * src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java: | |
10613 New. This state is used to enter a kilometer range. The difference to | |
10614 the LocationDistanceSelect state is, that there is no option to enter | |
10615 locations. | |
10616 | |
10617 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
10618 Improved this state to be the base state for calculation ranges. | |
10619 | |
10620 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java | |
10621 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java | |
10622 | |
10623 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
10624 state no longer inherits from RangeState which now is used as base | |
10625 state for kilometer ranges. | |
10626 | |
10627 * src/main/resources/messages.properties, | |
10628 src/main/resources/messages_de_DE.properties, | |
10629 src/main/resources/messages_en.properties, | |
10630 src/main/resources/messages_de.properties: Added new i18n strings for | |
10631 the DistanceSelect state. | |
10632 | |
10633 2011-06-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10634 | |
10635 * pom.xml: Downgraded Trove to 1.1-beta-5, because the new | |
10636 later ones are removed from the maven repos. | |
10637 | |
10638 The functionality we need is in 1.1 so this downgrade should | |
10639 cause no problems. | |
10640 | |
10641 Would be nice if we would support the maintainers of trove to | |
10642 bring there new versions back into the main maven repos. | |
10643 | |
10644 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
10645 | |
10646 * pom.xml: Repaired the JBoss repository which place has changed. | |
10647 | |
10648 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
10649 | |
10650 Tagged RELEASE 2.4 | |
10651 | |
10652 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
10653 | |
10654 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
10655 src/main/java/de/intevation/flys/exports/WstWriter.java: | |
10656 Append the corrected W column (if existing) to the WST export. | |
10657 | |
10658 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10659 | |
10660 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10661 Guessing increaing w is not based on direct neighbors any more. | |
10662 The second to be compared with is choosen by random of | |
10663 the values before the first one. This makes the guessing | |
10664 more robust against 'plateaus' of equal w values. | |
10665 | |
10666 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10667 | |
10668 * src/main/java/de/intevation/flys/exports/ATWriter.java: Array | |
10669 for constructing the spline was too large leading to non-increasing | |
10670 values. | |
10671 | |
10672 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10673 | |
10674 Fix for flys/issue150 | |
10675 | |
10676 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10677 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10678 Invert the x axis if its guessed that water is increasing. | |
10679 | |
10680 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10681 | |
10682 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(guessWaterIncreasing): | |
10683 Added a method to guess based on a given factor of the size (default 0.05) | |
10684 if the water levels are increasing. Needed to determine in which direction | |
10685 the water level curve should be orientated. Based on random to avoid | |
10686 running over large dataset each time a diagram is generated. | |
10687 | |
10688 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
10689 | |
10690 flys/issue177 (WINFO: Abflusskurven am Pegel verursachen ein Hängen des Servers) | |
10691 | |
10692 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10693 Commented out code to generate time ranges for series names. There | |
10694 seems to be a problem while loading the discharge tables of a gauge or | |
10695 while determining the start and/or end time of such discharge tables. | |
10696 | |
10697 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10698 | |
10699 * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. | |
10700 | |
10701 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10702 | |
10703 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10704 Removed dead code. | |
10705 | |
10706 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10707 | |
10708 Fix for flys/issue173 | |
10709 | |
10710 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10711 Fixed the way the gauge was found for a given interval. | |
10712 The old way does not work because it was just tested if | |
10713 the station point was inside the segments which is not | |
10714 necessarily true. The obvious solution to simply check | |
10715 the overlapping intervals does not work either because | |
10716 the gauge ranges touch each other and so more than | |
10717 one gauge are returned in these cases. The River.maxOverlap() | |
10718 is now used to find the gauge with the max overlapping | |
10719 range. | |
10720 | |
10721 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10722 | |
10723 Fix for flys/issue147 | |
10724 | |
10725 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
10726 Removed the 'kmUp' flag. It was an left over from former | |
10727 WSP calculations (w/o ref km) leading to wrong results now. | |
10728 | |
10729 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10730 Don't pass the kmUp flag to the calculation. | |
10731 | |
10732 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10733 Added debug output to see the value of 'wq_free'. | |
10734 | |
10735 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10736 | |
10737 Fix for flys/issue86 | |
10738 | |
10739 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10740 The reference gauge for calculations "am Pegel" was determined | |
10741 wrong. | |
10742 | |
10743 2011-06-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10744 | |
10745 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
10746 Conversion w->q was broken. This should fix a number of issues | |
10747 around "W am Pegel" calculations. | |
10748 | |
10749 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10750 Issue an error report if a w->q conversion fails. | |
10751 | |
10752 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10753 The gauge to convert w->q with its discharge table was determined wrong. | |
10754 | |
10755 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
10756 | |
10757 flys/issue174 (Diagramm: Q-Linie wird bei initialem Laden des Diagramms | |
10758 anders dargestellt als bei Ansicht auf gesamten Wertebereich) | |
10759 | |
10760 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10761 The chart will now have upper margins again. | |
10762 | |
10763 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
10764 | |
10765 flys/issue172 (Diagramm: Ursprung der Diagramme bei Dauerzahlen) | |
10766 | |
10767 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
10768 Charts of this type will have the lower X value set to "0". | |
10769 | |
10770 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10771 | |
10772 * src/main/java/de/intevation/flys/exports/ATWriter.java: | |
10773 Results are now in cm. Made it more robust against corner cases. | |
10774 | |
10775 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10776 Removed superfluous import. | |
10777 | |
10778 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10779 | |
10780 * doc/conf/artifacts/winfo.xml, doc/conf/conf.xml: | |
10781 Added facet config for AT exports. | |
10782 | |
10783 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
10784 Added 'at' facet type. | |
10785 | |
10786 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
10787 Generate AT facets. | |
10788 | |
10789 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10790 | |
10791 * src/main/java/de/intevation/flys/exports/ATExporter.java: New. | |
10792 Exporter for AT facets. Needs testing. | |
10793 | |
10794 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10795 | |
10796 * src/main/java/de/intevation/flys/exports/ATWriter.java: New. | |
10797 Writer for AT files. New code because our data model differs | |
10798 from Desktop-FLYS. Needs testing. | |
10799 | |
10800 2011-06-23 Ingo Weinzierl <ingo@intevation.de> | |
10801 | |
10802 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
10803 | |
10804 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10805 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10806 Moved the method that adjusts the X-axis to include the "0" value from | |
10807 ComputedDischargeCurveGenerator to DischargeCurveGenerator. Now, both | |
10808 charts will include the "0" on the X-axis. | |
10809 | |
10810 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10811 | |
10812 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
10813 Based on WQ now to make it exportable as AT. | |
10814 | |
10815 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10816 | |
10817 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10818 New. Base class for WQKms. | |
10819 | |
10820 TODO 1: make it a base class for WQDay, too, | |
10821 TODO 2: Generate instances of WQ instead of WQKms in "Abflusskurven" | |
10822 calculations. This will save memory. | |
10823 | |
10824 AT exporter will get instances of this class as data model | |
10825 | |
10826 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
10827 Add default constructor to ease inheritance. | |
10828 | |
10829 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
10830 Based on WQ now. Removed code allready defined in base class. | |
10831 | |
10832 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10833 | |
10834 * doc/conf/artifacts/winfo.xml: Add TODOs for error reports | |
10835 of "Abflusskurven am Pegel". Maybe we don't need them? | |
10836 | |
10837 * doc/conf/conf.xml: Configure report for each calculated output type. | |
10838 | |
10839 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
10840 | |
10841 flys/issue164 (Berechnung 4: Umgekehrtes Berechnungsintervall führt zur) | |
10842 | |
10843 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
10844 Create the items with range information for W and Q which allows the | |
10845 client to validate the user inserted values. | |
10846 | |
10847 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10848 | |
10849 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10850 Arguments in filling datastructure were flip. Now | |
10851 the "Abflusskurve am Pegel" looks correct again. | |
10852 | |
10853 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10854 Removed superfluous imports. | |
10855 | |
10856 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10857 | |
10858 Improved situtation on rendering "Abflusskurve am Pegel". Not | |
10859 fully working, yet. | |
10860 | |
10861 * doc/conf/artifacts/winfo.xml: Generate facets for the location path, too. | |
10862 | |
10863 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Misspelled | |
10864 the facet which prevented the facets from being to the outputs. | |
10865 | |
10866 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
10867 Extended to store the hash and the state id of the producing artifact/state | |
10868 else it results in NPEs because the data is calculated on later (wrong) states. | |
10869 | |
10870 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
10871 Store the state id and the hash in the facet, too. | |
10872 | |
10873 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Add two | |
10874 method to do calculations for a state the artifact is currently not in | |
10875 and fetching the current state id. | |
10876 | |
10877 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10878 | |
10879 * doc/conf/artifacts/winfo.xml: Generate facets for "Abflusskurven am Pegel" | |
10880 Not working by now. :-/ | |
10881 | |
10882 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New facet type | |
10883 for "Abflusskurven am Pegel" | |
10884 | |
10885 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Do calculation | |
10886 in the artifact not in the output generator. | |
10887 | |
10888 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
10889 Generate the new facets. | |
10890 | |
10891 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10892 Fetch data from facet. | |
10893 | |
10894 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
10895 | |
10896 flys/issue161 (Diagramm: Q-Achse in W-Längsschnitten immer bei Q=0) | |
10897 | |
10898 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10899 The Q axis (which is the second y axis) initially contains the 0 value. | |
10900 After a zoom action has taken place, this behaviour is no longer | |
10901 supported. | |
10902 | |
10903 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10904 | |
10905 Draw correction curve again. | |
10906 | |
10907 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
10908 Use correction curve to map plot to axes. Not doing so prevented | |
10909 the correction curve from being drawn! | |
10910 Smaller code cleanups and simplifications. | |
10911 | |
10912 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
10913 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
10914 Added methods to directly access the components w, q and c | |
10915 at a given index. | |
10916 | |
10917 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
10918 Attribute access via DOM instead of XPath. | |
10919 | |
10920 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10921 Code simplification. | |
10922 | |
10923 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10924 | |
10925 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
10926 | |
10927 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Splitted | |
10928 up zooming for x and y axes to be able to override specific axis | |
10929 zoom behaviour. | |
10930 | |
10931 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10932 The lower bound of the x axis (which is the Q axis in such chart) is | |
10933 always 0. | |
10934 | |
10935 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10936 | |
10937 flys/issue90 (Diagramm: Trennung derDiagrammfläche und Achsenaufheben) | |
10938 | |
10939 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
10940 Added a margin between chart data and chart axes. | |
10941 | |
10942 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10943 | |
10944 Fix for flys/issue158 | |
10945 | |
10946 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
10947 Checks for right class now. | |
10948 | |
10949 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10950 | |
10951 Fix for flys/issue154 | |
10952 | |
10953 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
10954 Checks for right class now. | |
10955 | |
10956 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10957 | |
10958 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10959 Only generate 'outs' if they have facets. | |
10960 | |
10961 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
10962 'boolean ? true : false' <=> 'boolean' | |
10963 | |
10964 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10965 | |
10966 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
10967 Added the time-to-live to the DESCRIBE document. | |
10968 | |
10969 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10970 | |
10971 * doc/conf/artifacts/winfo.xml: Configured states to generate report facets. | |
10972 | |
10973 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10974 | |
10975 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
10976 Return the report. | |
10977 | |
10978 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10979 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10980 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10981 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10982 Generate report facets if there are problems with the calculations. | |
10983 TODO: Adjust winfo.xml to configure the facets. | |
10984 | |
10985 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10986 | |
10987 * src/main/java/de/intevation/flys/exports/ReportGenerator.java: | |
10988 New. Generator for calculation reports. | |
10989 | |
10990 * doc/conf/conf.xml: Added ReportGenerator. | |
10991 | |
10992 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
10993 Added type 'report'. | |
10994 | |
10995 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
10996 Specialized facet for serving reports. TODO: Added them to the | |
10997 calculation states. | |
10998 | |
10999 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
11000 Looped through CallMeta for i18n purposes. TODO: do i18n | |
11001 | |
11002 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11003 Removed superfluous import. | |
11004 | |
11005 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
11006 Added some override annotations. | |
11007 | |
11008 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11009 | |
11010 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java: | |
11011 New. Used to transport the data and the error report. | |
11012 | |
11013 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
11014 src/main/java/de/intevation/flys/artifacts/model/Calculation1.java, | |
11015 src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, | |
11016 src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, | |
11017 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java, | |
11018 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
11019 src/main/java/de/intevation/flys/artifacts/model/Calculation.java, | |
11020 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
11021 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
11022 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
11023 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
11024 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
11025 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11026 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
11027 Use the CalculationResult now. | |
11028 | |
11029 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11030 | |
11031 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
11032 Allow an explicit reference km to enable calculation "am Pegel". | |
11033 | |
11034 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11035 If a calculation "am Pegel" is done, take start km of the | |
11036 calculation range and find the gauge in which range it is located. | |
11037 Take the station of the gauge as the reference km. If no gauge | |
11038 is found the calcualtion falls back to calculation "auf freier Strecke". | |
11039 | |
11040 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11041 Replaced another inefficient attribute extraction via XPath | |
11042 with direct DOM access. | |
11043 | |
11044 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11045 | |
11046 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
11047 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
11048 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11049 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11050 Removed dead code. | |
11051 | |
11052 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11053 | |
11054 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java | |
11055 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
11056 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
11057 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
11058 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
11059 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
11060 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
11061 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
11062 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11063 Only generate facets when needed. | |
11064 | |
11065 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
11066 Removed more XPath for simply accessing attributes of an element. | |
11067 | |
11068 * doc/conf/cache.xml: 200 elements in memory for "computed.values" are enough, | |
11069 LRU as eviction strategy is sufficent. | |
11070 | |
11071 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
11072 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Use | |
11073 more 'standard' Java naming conventions. | |
11074 | |
11075 2011-06-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11076 | |
11077 Merged in the facet-slt branch to bring in the 'facet' feature. | |
11078 | |
11079 * doc/conf/artifacts/winfo.xml: Fixed some facets. | |
11080 | |
11081 * doc/conf/cache.xml: Added a "computed.values" cache to store the | |
11082 results of the WINFO calculations. | |
11083 | |
11084 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
11085 Add support for index per facet to make them unique and identifiable. | |
11086 | |
11087 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
11088 New. Inteface to be used to access the facet names of the configuration. | |
11089 | |
11090 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: New. | |
11091 A facet to be used to have raw access to the computed data of an artifact. | |
11092 Useful to export things like CSV and WST. | |
11093 | |
11094 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: New. | |
11095 Specialized facet to access the water level data stored in WQKms arrays. | |
11096 | |
11097 * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: New. | |
11098 Specialized facet to access the duration data stored in WQDay data structures. | |
11099 | |
11100 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Facets are | |
11101 now generated dynamically from the current available ones stored with | |
11102 the artifact. | |
11103 | |
11104 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Added | |
11105 methods computeAdvance() and computeFeed() called if artifact is fed or | |
11106 adance. This overwritten in subclasses to do the state depending calculations. | |
11107 | |
11108 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
11109 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
11110 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
11111 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
11112 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: These | |
11113 states overwrites the computeAdvance() and computeFeed() methods to do | |
11114 the corresponding WINFO calculations. | |
11115 | |
11116 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Calls | |
11117 computeAdvance() and computeFeed() if artifact is fed or advanced. Centralized | |
11118 the caching mechanism. | |
11119 | |
11120 * src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
11121 src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
11122 src/main/java/de/intevation/flys/collections/OutputParser.java, | |
11123 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
11124 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11125 Adjusted the code to cope with the indices of the facets. Used | |
11126 DOM to access the attributes instead of XPath. Removed smaller bugs | |
11127 concerning position generation. | |
11128 | |
11129 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
11130 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
11131 src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
11132 Forwarded facet references. | |
11133 | |
11134 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
11135 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
11136 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11137 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
11138 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
11139 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
11140 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
11141 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
11142 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11143 Uses facets to fetch data and generate output now. | |
11144 | |
11145 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
11146 | |
11147 * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that | |
11148 determines the mode of calculation 1. If it is "false" (default), | |
11149 the calculation should be bound to a gauge. | |
11150 | |
11151 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11152 method to retrieve the information about the "wq_free" parameter. | |
11153 | |
11154 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
11155 | |
11156 * doc/conf/artifacts/winfo.xml: Added a facet for corrected W in | |
11157 computation 4. | |
11158 | |
11159 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11160 | |
11161 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
11162 Got rid of namespace in result document. | |
11163 | |
11164 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
11165 | |
11166 flys/issue77 (Diagramm: Beschriftung der Kurven bei Dauerlinien) | |
11167 | |
11168 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
11169 Give the curves in the chart names. | |
11170 | |
11171 * src/main/resources/messages.properties, | |
11172 src/main/resources/messages_de_DE.properties, | |
11173 src/main/resources/messages_en.properties, | |
11174 src/main/resources/messages_de.properties: Added titles for duration | |
11175 chart curves. | |
11176 | |
11177 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11178 | |
11179 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
11180 Write top 'Oberkante' and bottom 'Unterkante' to out going XML | |
11181 if they exist. | |
11182 | |
11183 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
11184 | |
11185 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11186 Write the min/max W/Q ranges as art:range elements into the DESCRIBE. | |
11187 | |
11188 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
11189 | |
11190 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
11191 This state that is used to retrieve locations will now write the | |
11192 kilometer range of the selected river into the DESCRIBE document. | |
11193 | |
11194 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11195 | |
11196 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
11197 New. Factored out version of "Wasserspiegellage" calculation. | |
11198 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
11199 | |
11200 Removed some dead code. | |
11201 | |
11202 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
11203 Added Override annotation and used quick access method. | |
11204 | |
11205 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11206 Looped through error reporting use by interpolate. | |
11207 | |
11208 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11209 Used factored out version of calculation 1. Removed dead code. | |
11210 | |
11211 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11212 | |
11213 * src/main/java/de/intevation/flys/artifacts/model/Calculation2.java: | |
11214 New. Factored out version of "Abflusskurve". | |
11215 | |
11216 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11217 Loop errors through w/q at km interpolation. | |
11218 | |
11219 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11220 Use factored out version of calculation 2. | |
11221 | |
11222 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11223 | |
11224 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
11225 New. Factored out version of "Dauerzahlen". | |
11226 | |
11227 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11228 Loop errors through for q->w interpolations. | |
11229 | |
11230 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
11231 Added constructor to directly create with calculated results. | |
11232 | |
11233 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
11234 Added method to return the number of problems. | |
11235 | |
11236 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11237 Use factored out version of calculation 3. | |
11238 | |
11239 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11240 | |
11241 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
11242 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java, | |
11243 src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
11244 Added methods to remove NaN values. | |
11245 | |
11246 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11247 | |
11248 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
11249 New. Base class for calculations. Used to collect problems occuring | |
11250 during calculation. | |
11251 | |
11252 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
11253 Extends Calculation now. Looped through the problem reports to | |
11254 base class. | |
11255 | |
11256 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11257 Looped through the problem reports. | |
11258 | |
11259 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
11260 | |
11261 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11262 Append the min/max range and a transformation matrix for each axis. | |
11263 | |
11264 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
11265 Instantiate the InfoGeneratorHelper with a XYChartGenerator instance. | |
11266 | |
11267 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
11268 Changed the zoom operation. The zoom values defined in the chart request | |
11269 document are no longer absolute values for a specific axis. Those values | |
11270 represent percental values for the start and end point of x and y axes. | |
11271 E.g. a chart has three axes with the following ranges: | |
11272 - x axis : 0 - 10 | |
11273 - y axis 1: 20 - 40 | |
11274 - y axis 2: 40 - 90 | |
11275 - zoom values for x: 0.1 - 0.9 (10% - 90%) | |
11276 - zoom values for y: 0.2 - 0.8 (20% - 80%) | |
11277 The produced chart will have the following ranges: | |
11278 - x axis : 1 - 9 | |
11279 - y axis 1: 24 - 36 | |
11280 y axis 2: 50 - 80 | |
11281 | |
11282 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
11283 | |
11284 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
11285 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
11286 Map datasets to axes correctly. | |
11287 | |
11288 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11289 | |
11290 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
11291 Determine the gauges by their station positions. This hopfully | |
11292 fixes the problem with wrong assigned gauges and invalid segments. | |
11293 | |
11294 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11295 | |
11296 * src/main/java/de/intevation/flys/artifacts/model/Segment.java, | |
11297 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
11298 Added more debug output. | |
11299 | |
11300 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
11301 | |
11302 flys/issue103 PART 1 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz) | |
11303 | |
11304 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11305 Selected values are formatted with the current locale. The static part | |
11306 of the DESCRIBE document will now contain i18n formatted numbers. | |
11307 | |
11308 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
11309 | |
11310 flys/issue93 (WINFO: Benennung der Berechnungsart korrigieren) | |
11311 | |
11312 * src/main/resources/messages_de_DE.properties, | |
11313 src/main/resources/messages_de.properties: Changed the name of | |
11314 calculation 4. | |
11315 | |
11316 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
11317 | |
11318 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
11319 Made the range determination more robust against NaN values. | |
11320 | |
11321 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
11322 | |
11323 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11324 The second y axis is set to position "1". It was set to "2" before, but | |
11325 in that case, there was no position "1". | |
11326 | |
11327 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11328 | |
11329 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11330 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
11331 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
11332 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11333 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
11334 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
11335 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
11336 s@m³/s@m\\u00b3/s@ | |
11337 | |
11338 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11339 | |
11340 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11341 Only generate an axis element if a axis really exists. | |
11342 | |
11343 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11344 | |
11345 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11346 Simpified array swapping. | |
11347 | |
11348 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11349 | |
11350 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
11351 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11352 Use java.util.List instead of java.util.Vector | |
11353 | |
11354 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
11355 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
11356 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
11357 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11358 Removed superfluous imports. | |
11359 | |
11360 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11361 | |
11362 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11363 createItem() is not abstract any longer to avoid code repetitionin sub classes. | |
11364 | |
11365 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
11366 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
11367 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
11368 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
11369 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
11370 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
11371 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
11372 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
11373 Removed duplicated code, inserted default constructors and Override annotations. | |
11374 | |
11375 2011-06-07 Ingo Weinzierl <ingo@intevation.de> | |
11376 | |
11377 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11378 Append axes range information to the info document. | |
11379 | |
11380 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11381 | |
11382 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11383 If feed() fails do not store invalid values in database. | |
11384 | |
11385 2011-06-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11386 | |
11387 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11388 Removed asymmetrical "- 1" from width calculation. | |
11389 | |
11390 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11391 | |
11392 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
11393 Fixed problem when more than one value per segment are given. | |
11394 | |
11395 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11396 | |
11397 Refactored version of "Berechnung 4" | |
11398 | |
11399 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
11400 Added instance fields for a reference point (= location of gauge) | |
11401 and backup of values (needed for naming). | |
11402 | |
11403 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
11404 Added a constructor to be created from a WQKms. This is helpful | |
11405 if a WQKms is replaced by a back jump correction. | |
11406 | |
11407 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
11408 New. Outfactored version of "W bei ungleichmaessigen Abflusslaengsschnitt". | |
11409 Much cleaner now and it should have a better handling of the corner | |
11410 cases. | |
11411 | |
11412 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11413 Removed the linear interpolation stuff. It is now in Linear. Removed | |
11414 the LinearRemap interpolation method because it is not needed any | |
11415 longer. Added a method to interpolate a given km with a given | |
11416 function. | |
11417 | |
11418 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11419 Removed the old calc 4 and used the new one. | |
11420 | |
11421 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11422 Deleted. Not needed any longer. | |
11423 | |
11424 * src/main/java/de/intevation/flys/artifacts/math/Function.java: | |
11425 New. Interface for a uni-variate real function. | |
11426 | |
11427 * src/main/java/de/intevation/flys/artifacts/math/Identity.java: | |
11428 New. Implements Function with f(x) = x | |
11429 | |
11430 * src/main/java/de/intevation/flys/artifacts/math/Linear.java: | |
11431 New. Implements Function with f(x) = m*x + b | |
11432 | |
11433 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11434 Factored some stuff out to DoubleUtil. Removed some dead code. | |
11435 Does some rounding correct. | |
11436 | |
11437 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: New. | |
11438 Centralized utils surrounding common double operations. | |
11439 | |
11440 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
11441 Removed superfluous imports. | |
11442 | |
11443 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11444 | |
11445 flys/issue90(Diagramm: Trennung der Diagrammfläche und Achsen aufheben) | |
11446 | |
11447 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
11448 Determine the ranges of x and y axes. If no zoom ranges are given, we | |
11449 will determine the min and max xy values in the dataset manually, | |
11450 because JFreeCharts adds a margin to the left and right of the data | |
11451 area automatically.. | |
11452 | |
11453 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11454 | |
11455 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved | |
11456 the chart creation into an own public method. This lets the | |
11457 ChartInfoGenerator create charts without duplicating code. | |
11458 | |
11459 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
11460 Limited the possible class for generators to XYChartGenerator. This | |
11461 enables the ChartInfoGenerator class to do the whole chart creation | |
11462 stuff itself without outsourcing the code to concrete subclasses. | |
11463 | |
11464 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
11465 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
11466 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
11467 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
11468 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
11469 Removed the code to generate charts - this is done in ChartInfoGenerator | |
11470 now. | |
11471 | |
11472 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11473 | |
11474 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
11475 methods to extract the x and y ranges from request document. | |
11476 | |
11477 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
11478 method that zooms the chart to the specified x and y ranges. | |
11479 | |
11480 2011-06-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11481 | |
11482 * doc/conf/conf.xml: Set collection ttl to 6 hours. | |
11483 | |
11484 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11485 | |
11486 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
11487 New. Parse segments only once. | |
11488 | |
11489 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11490 Expose new parser to artifacts. TODO: Use it. | |
11491 | |
11492 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11493 | |
11494 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11495 Changed interpolation methods to interpolate to an arbitrary position | |
11496 in a given double result array as a preparation for segment independent | |
11497 calculation. | |
11498 | |
11499 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11500 Removed superfluous import. | |
11501 | |
11502 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11503 Fixed cause for crashing: Run back too far in some siutations. | |
11504 | |
11505 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11506 Refactored range code a bit. Needs more work. | |
11507 | |
11508 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
11509 | |
11510 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11511 Interchange the lower and upper x value of the chart if the x-axis is | |
11512 inverted before the matrix values are computed. Now, the matrix is able | |
11513 to work with charts that have an inverted x-axis. | |
11514 | |
11515 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
11516 | |
11517 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: New. A | |
11518 chart info generator generates a document that contains meta information | |
11519 for a specific chart. Concrete instances of this abstract class need to | |
11520 instantiate concrete ChartGenerators and dispatch nearly all methods of | |
11521 an OutGenerator (init(), doOut(), setMaster()) to this instance. The | |
11522 generate() method is implemented in the ChartInfoGenerator itself. It | |
11523 creates a chart with help of the ChartGenerator instance and builds a | |
11524 document that contains meta information of this chart. | |
11525 | |
11526 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: New. | |
11527 This helper is used to create the chart info document. At the moment, | |
11528 the only information that is included in this document is a | |
11529 transformation matrix to transform image coordinates into chart | |
11530 coordinates. | |
11531 | |
11532 NOTE: The transformation matrix creation needs some work to support | |
11533 charts with inverted X axis. | |
11534 | |
11535 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
11536 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
11537 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
11538 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
11539 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
11540 Concrete instances of ChartInfoGenerator that create the chart info for | |
11541 the currently supported chart types. | |
11542 | |
11543 * doc/conf/conf.xml: Registered new OutGenerators. | |
11544 | |
11545 2011-05-31 Ingo Weinzierl <ingo@intevation.de> | |
11546 | |
11547 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11548 Added support for the 'type' paramter of the collection's out() | |
11549 operation. | |
11550 | |
11551 2011-05-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11552 | |
11553 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
11554 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11555 Use an explicit reference km for interpolation now. | |
11556 | |
11557 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11558 | |
11559 * doc/conf/cache.xml: Introduced cache to store the distance info per river. | |
11560 This boosts performance in following ab setup from 3.61 to 39.91 requests/secs. | |
11561 | |
11562 $ ab -c 20 -n 1000 -p distances.xml http://127.0.0.1:8181/service/distanceinfo | |
11563 | |
11564 $ cat distances.xml | |
11565 <?xml version="1.0" encoding="UTF-8"?> | |
11566 <art:river xmlns:art="http://www.intevation.de/2009/artifacts">Elbe</art:river> | |
11567 | |
11568 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: Added | |
11569 an iterator result to avoid construction expensive interim lists. | |
11570 | |
11571 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: Use | |
11572 the cache if configured. | |
11573 | |
11574 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11575 | |
11576 flys/issue82 | |
11577 | |
11578 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11579 Only successful interpolations are named. | |
11580 | |
11581 2011-05-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11582 | |
11583 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11584 Make it work independent of river flow direction. | |
11585 | |
11586 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11587 Fixed bug in ordering segments | |
11588 | |
11589 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-enabled | |
11590 calculation of the back jump correction. Fixed more flow direction issues. | |
11591 | |
11592 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11593 | |
11594 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11595 Removed call of XMLDebug class which is not in the version control. | |
11596 | |
11597 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11598 | |
11599 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11600 Moved the code part that skips themes right after the part that sets the | |
11601 master artifact for the OutGenerator. We need this master artifact to | |
11602 display empty charts - master artifact is used to create titles and | |
11603 axes. | |
11604 | |
11605 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11606 | |
11607 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11608 Deactivated themes are not put into the chart. | |
11609 | |
11610 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11611 | |
11612 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
11613 Repaired broken XPath expressions to find the output modes in an | |
11614 attribute document of a collection. | |
11615 | |
11616 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: This | |
11617 writer will now create a document that has a root node art:attribute. | |
11618 Before these changes, the document's root node was art:outputs which is | |
11619 part of the attribute document but not the right root node. | |
11620 | |
11621 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11622 Adapted some XPath expressions and corrected the the process to create | |
11623 attribute documents. | |
11624 | |
11625 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11626 | |
11627 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11628 Made it work independent of from/to order. | |
11629 | |
11630 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11631 Added method to extract the ranges correctly from data. | |
11632 | |
11633 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11634 Use the correct ranges. Comment out backjump detection temporarily. | |
11635 | |
11636 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11637 | |
11638 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11639 Generate fields for w/q input depend on flow direction. | |
11640 | |
11641 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11642 Moved km up question out of loop. | |
11643 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11644 | |
11645 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11646 Take the flow direction into account. | |
11647 | |
11648 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11649 Prevent NPE. | |
11650 | |
11651 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
11652 Allow to be 'from' greater than 'to' in ranges. | |
11653 | |
11654 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Negate | |
11655 step if 'from' is greater than 'to'. | |
11656 | |
11657 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11658 | |
11659 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11660 Round exploded values to a precision of 1e-6. | |
11661 | |
11662 2011-05-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11663 | |
11664 Qs are now stored in ranges for each column. | |
11665 | |
11666 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
11667 Deleted. | |
11668 | |
11669 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11670 Was WstValueTableFactory2. | |
11671 | |
11672 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
11673 node linking bug. Removed dead code. | |
11674 | |
11675 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11676 Q values are now stored in range trees by each column. The qs of the rows | |
11677 are removed and the calculations are adjusted. Removed dead code. | |
11678 | |
11679 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11680 | |
11681 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11682 Moved cache name to WstValueTableCacheKey. Do not cache null references. | |
11683 | |
11684 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
11685 Moved cache name into this class. | |
11686 | |
11687 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11688 Store QRangeTree for each column of value table. TODO: Use them! | |
11689 | |
11690 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
11691 Intended as a replacement for WstValueTableFactory, but is work in progress. | |
11692 | |
11693 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
11694 index errors and added methods to dump as graphviz graph. | |
11695 | |
11696 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11697 | |
11698 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
11699 Improved the validation of WQ values. | |
11700 | |
11701 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Use the | |
11702 correct input data object to determine the selected WQ mode (range or | |
11703 single input). | |
11704 | |
11705 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11706 | |
11707 ISSUE-40 (part I/II) | |
11708 | |
11709 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11710 Write default values (values already selected by the user before) of the | |
11711 input data items into DESCRIBE. | |
11712 | |
11713 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11714 | |
11715 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11716 Removed needless imports. | |
11717 | |
11718 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11719 | |
11720 ISSUE-85 (part III/III) | |
11721 | |
11722 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11723 Added a static function that returns the kilometer values (double[]) | |
11724 from locations input (whitespace separated double values). | |
11725 | |
11726 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
11727 the getKms() method. It will now return a computed array of kilometers | |
11728 if we had inserted a range, or it will return the inserted kilometers if | |
11729 we had inserted locations. | |
11730 | |
11731 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11732 | |
11733 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11734 Moved cache key to separate class. | |
11735 | |
11736 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
11737 New. The new cache key class. | |
11738 | |
11739 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11740 | |
11741 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
11742 Model to store the q values of a WST column efficiently. First | |
11743 building block not to store the q values directly aside the | |
11744 w values. | |
11745 | |
11746 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11747 | |
11748 ISSUE-85 (part I/III) | |
11749 | |
11750 * doc/conf/artifacts/winfo.xml: Added two further field 'ld_mode' and | |
11751 'ld_locations' to the range/locations state to track the selected mode | |
11752 and locations. | |
11753 | |
11754 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11755 Added methods to validate the user inserted locations. | |
11756 | |
11757 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11758 method to determine of a range or locations have been inserted. | |
11759 | |
11760 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
11761 | |
11762 ISSUE-62 (part II/II) | |
11763 | |
11764 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Dump the | |
11765 artifacts state/data in DEBUG mode in describe(). | |
11766 | |
11767 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
11768 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
11769 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
11770 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
11771 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
11772 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
11773 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
11774 States will no longer store data. The only reason for states storing | |
11775 StateData is to know about the necessary data for this state. If a State | |
11776 needs to access the user input for a specific StateData object, it needs | |
11777 to query the FLYSArtifact which stores the data. | |
11778 | |
11779 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
11780 | |
11781 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11782 method to dump the artifacts state(s)/data. | |
11783 | |
11784 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11785 | |
11786 flys/issue84 | |
11787 | |
11788 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
11789 Forget to select wst kind. | |
11790 | |
11791 2011-05-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11792 | |
11793 flys/issue81 | |
11794 | |
11795 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11796 weights for kms were swapped. | |
11797 | |
11798 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
11799 | |
11800 Tagged RELEASE 2.3.1 | |
11801 | |
11802 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
11803 | |
11804 * Changes: Prepared changes for the upcoming release. | |
11805 | |
11806 2011-05-20 Hans Plum <hans@intevation.de> | |
11807 | |
11808 * NEWS: | |
11809 Hint to Release 2.3.1. For further information look into module | |
11810 flys-client/NEWS | |
11811 | |
11812 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11813 | |
11814 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java (getExplodedValues): | |
11815 Increment kms array size by one to take the end of range, too. | |
11816 | |
11817 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11818 | |
11819 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11820 Sort by rows (should not be necessary). | |
11821 | |
11822 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11823 Use unsharp km lookup (epsilon = 0.0001). This fixes the problem | |
11824 that some kms were not found. | |
11825 | |
11826 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11827 | |
11828 flys/issue66 | |
11829 | |
11830 * src/main/resources/messages_en.properties: Fixed broken template. | |
11831 | |
11832 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11833 | |
11834 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11835 Set the name of the computed discharge curve objects. | |
11836 | |
11837 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11838 The curves of this chart will now have names that consist of the word | |
11839 'Discharge Curve', the river name and the kilometer that has been used | |
11840 for the computation. | |
11841 | |
11842 * src/main/resources/messages.properties, | |
11843 src/main/resources/messages_de_DE.properties, | |
11844 src/main/resources/messages_en.properties, | |
11845 src/main/resources/messages_de.properties: Added i18n strings for the | |
11846 computed discharge curves. | |
11847 | |
11848 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11849 | |
11850 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11851 Added convenience method isQ() to determine if we are | |
11852 doing Q calculations. | |
11853 | |
11854 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11855 Reintroduced titles for the "W for unausgeglichene Abfluesse". | |
11856 | |
11857 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11858 | |
11859 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
11860 The curves will now have names that consist of the gauge name and its | |
11861 valid time range. | |
11862 | |
11863 * src/main/resources/messages.properties, | |
11864 src/main/resources/messages_de_DE.properties, | |
11865 src/main/resources/messages_en.properties, | |
11866 src/main/resources/messages_de.properties: Added i18n strings for the | |
11867 discharge curves. | |
11868 | |
11869 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11870 | |
11871 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11872 Removed dead code. | |
11873 | |
11874 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11875 | |
11876 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11877 Use the correct method to generate kms. | |
11878 | |
11879 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11880 Added some logging to test the map in debug mode. | |
11881 | |
11882 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11883 | |
11884 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11885 Made getExplodedValues static. | |
11886 | |
11887 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11888 Use new logic to calculate "W für ungleichwertige Abfluesse". | |
11889 Not working, yet. | |
11890 | |
11891 * ChangeLog: Fixed former entry. | |
11892 | |
11893 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11894 | |
11895 * doc/conf/artifacts/winfo.xml: Registered the WST export for discharge | |
11896 longitudinal sections. | |
11897 | |
11898 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Set the | |
11899 names of the discharge longitudinal section computation results. | |
11900 | |
11901 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
11902 The W/Q curves in the chart will now have names. | |
11903 | |
11904 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11905 The WstWriter is filled with column names in an own method. So, we are | |
11906 able to override this process in subclasses. | |
11907 | |
11908 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
11909 Adapted the column names for the WST export. | |
11910 | |
11911 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11912 | |
11913 Work on flys/issue69 | |
11914 | |
11915 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11916 Use new logic to calculate "Wasserstand/Wasserspiegellage". | |
11917 Compared to desktop FLYS are the results are structurally right | |
11918 but a bit off in the positions after the decimal points. | |
11919 Maybe a result of the interpolation? Need to debug this. | |
11920 | |
11921 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11922 | |
11923 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11924 W and Q curves will now have names based on the defined W or Q values | |
11925 for the waterlevel computation. | |
11926 | |
11927 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11928 | |
11929 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
11930 New. This object is used to give objects a name. | |
11931 | |
11932 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Inherit | |
11933 from NamedObject now. Because we need to display names for those objects | |
11934 in different places. | |
11935 | |
11936 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The WQKms | |
11937 objects returned by a waterlevel computation will now have names. | |
11938 | |
11939 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11940 Insert the column names for the WSTs into the WstWriter. | |
11941 | |
11942 * src/main/java/de/intevation/flys/exports/WstWriter.java: The column | |
11943 names are written into the head of the WSTs now. | |
11944 | |
11945 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11946 | |
11947 * src/main/java/de/intevation/flys/artifacts/model/WstLine.java: New. This | |
11948 class is used to store the W/Q values of a specific kilometer of a WST. | |
11949 | |
11950 * src/main/java/de/intevation/flys/exports/WstWriter.java: New. A writer | |
11951 that creates WSTs. | |
11952 | |
11953 TODO: The header of the WSTs is not finished. The Q descriptions are | |
11954 missing. | |
11955 | |
11956 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11957 Enabled WST exports. | |
11958 | |
11959 * doc/conf/artifacts/winfo.xml: Registered the WST export for waterlevels. | |
11960 | |
11961 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11962 | |
11963 * src/main/java/de/intevation/flys/utils/Formatter.java: New. This class | |
11964 supports functions to retrieve formatters for specific types of data | |
11965 used in FLYS. | |
11966 | |
11967 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11968 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11969 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
11970 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
11971 Removed the formatter declaration - the whole formatter stuff is done in | |
11972 Formatter now. | |
11973 | |
11974 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11975 | |
11976 ISSUE-72 | |
11977 | |
11978 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
11979 Repaired broken XPath expressions to extract start and end kilometer. | |
11980 | |
11981 2011-05-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11982 | |
11983 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11984 Removed the Hibernate loading stuff. | |
11985 | |
11986 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11987 New. The Hibernate loading. | |
11988 | |
11989 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11990 Use the WstValueTableFactory for loading now. | |
11991 | |
11992 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11993 | |
11994 Tagged RELEASE 0.1 aka Version 2.3.0 | |
11995 | |
11996 2011-05-16 Hans Plum <hans@intevation.de> | |
11997 | |
11998 * NEWS: | |
11999 New. Giving some user specific perspective to new functionality and | |
12000 changes. This file references releases dates only; details can be find | |
12001 in the client module at flys-client. | |
12002 | |
12003 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12004 | |
12005 First step to calculate "W fuer ungleichwertige Abfluesse" correctly. | |
12006 flys/issue55 | |
12007 | |
12008 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
12009 New. Remaps "gleichwertige" Q values to the corresponding | |
12010 "ungleichwertige" Q values depending on km. | |
12011 | |
12012 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12013 Remap the Q values "ungleichwertig" depending on the | |
12014 "gleichwertige" ones. | |
12015 | |
12016 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12017 | |
12018 First step to fix flys/issue69 | |
12019 | |
12020 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12021 New code path to implement the calculation of "Wasserstand/Wasspiegellage" | |
12022 correctly. TODO 1: Use new path in UI. TODO 2: Remove unused old code. | |
12023 | |
12024 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
12025 | |
12026 * Changes: Prepared Changes for the upcoming release 2.3 - see Changes | |
12027 file to get to know about the changes of the version numbers. | |
12028 | |
12029 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
12030 | |
12031 ISSUE-37 | |
12032 | |
12033 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: This | |
12034 state would be happy if there is a UI provider called "river_panel". | |
12035 | |
12036 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
12037 | |
12038 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
12039 methods that return the requested chart size as integer array [width, | |
12040 height]. The requested size is read from the incomding request document. | |
12041 | |
12042 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The size | |
12043 of a chart is no longer static. The requested size is fetched using | |
12044 ChartGenerator.getSize(). | |
12045 | |
12046 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
12047 | |
12048 ISSUE-52 | |
12049 | |
12050 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12051 The X-Axis of such a chart is inverted, if the head of the river is not | |
12052 at kilometer 0. This type of charts always have the head of the river at | |
12053 the left side. | |
12054 | |
12055 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12056 | |
12057 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12058 Make incoming XML symmetric to DistanceInfoService. | |
12059 | |
12060 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12061 | |
12062 ISSUE-47 | |
12063 | |
12064 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
12065 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
12066 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12067 Adjusted temporarily the color of the W, Q and corrected W curves to | |
12068 distinguish each other. | |
12069 | |
12070 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12071 | |
12072 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
12073 Adjusted the plot of xy charts - the gridlines are displayed now. | |
12074 | |
12075 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12076 | |
12077 ISSUE-53 | |
12078 | |
12079 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
12080 Added a method that returns the preferred locale based on the available | |
12081 locales of the server and the desired locales of the request (CallMeta). | |
12082 | |
12083 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a | |
12084 method that creates a number formatter with minimum and maximum digits. | |
12085 | |
12086 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
12087 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
12088 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
12089 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
12090 Formatted the number values of the CSV exports. | |
12091 | |
12092 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12093 | |
12094 * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: | |
12095 New. A data structure that enables us to save a data triple: a range | |
12096 that consist of lower and upper double value and a set of values that | |
12097 belong to this range. | |
12098 | |
12099 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
12100 Implemented the validation of W/Q values. | |
12101 | |
12102 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12103 | |
12104 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New | |
12105 method to retrieve i18n messages based on keys. | |
12106 | |
12107 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
12108 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
12109 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
12110 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
12111 Added headers for CSV exports. | |
12112 | |
12113 * src/main/resources/messages.properties, | |
12114 src/main/resources/messages_de_DE.properties, | |
12115 src/main/resources/messages_en.properties, | |
12116 src/main/resources/messages_de.properties: Added new i18n strings for | |
12117 CSV headers. | |
12118 | |
12119 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12120 | |
12121 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12122 Fetches river name from incoming XML document. If no river is given all | |
12123 infos about all rivers are listed. | |
12124 | |
12125 * src/main/resources/metadata/template.xml: Templates honors the 'river' | |
12126 parameter. | |
12127 | |
12128 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
12129 Extended to pass parameters to the templating. Added support for | |
12130 type conversion. | |
12131 | |
12132 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
12133 Take parameters as an initial stack frame. | |
12134 | |
12135 * src/main/java/de/intevation/flys/artifacts/services/meta/TypeConverter.java: | |
12136 New. Converts types off stacked variables. | |
12137 | |
12138 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12139 | |
12140 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
12141 method to add subtitles to charts. The implementation in this class does | |
12142 not add any subtitle. Concrete subclasses may override this method to | |
12143 add some. | |
12144 | |
12145 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
12146 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12147 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
12148 Add subtitles to charts. | |
12149 | |
12150 * src/main/resources/messages.properties, | |
12151 src/main/resources/messages_de_DE.properties, | |
12152 src/main/resources/messages_en.properties, | |
12153 src/main/resources/messages_de.properties: Added i18n templates for | |
12154 compound messages (chart subtitles). | |
12155 | |
12156 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12157 | |
12158 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
12159 Added new methods to retrieve translated compound messages. | |
12160 | |
12161 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12162 | |
12163 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a | |
12164 method to set the master artifact that should be used for some special | |
12165 operations. | |
12166 | |
12167 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
12168 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
12169 Implement the setMasterArtifact() method of the interface. | |
12170 | |
12171 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12172 Call OutGenerator.setMasterArtifact(). | |
12173 | |
12174 NOTE: The determination of the master artifact needs to be implemented! | |
12175 | |
12176 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
12177 | |
12178 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
12179 hard coded dev code that defined a WQ mode. | |
12180 | |
12181 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12182 | |
12183 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
12184 Stripped ugly extra whitespace from output introduced by | |
12185 templating. | |
12186 | |
12187 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12188 | |
12189 * src/main/resources/metadata/template.xml: Added forgotten | |
12190 columns of fixation WSTs. | |
12191 | |
12192 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
12193 | |
12194 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
12195 method to retrieve i18n strings. | |
12196 | |
12197 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
12198 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
12199 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12200 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
12201 Enabled i18n support for chart title and axes labels. | |
12202 | |
12203 * src/main/resources/messages.properties, | |
12204 src/main/resources/messages_de_DE.properties, | |
12205 src/main/resources/messages_en.properties, | |
12206 src/main/resources/messages_de.properties: Added i18n strings for the | |
12207 chart types above. | |
12208 | |
12209 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
12210 | |
12211 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
12212 New. This OutGenerator exports the data of a discharge longitudinal | |
12213 section computation. | |
12214 | |
12215 * doc/conf/conf.xml: Added the DischargeLongitudinalSectionExporter. | |
12216 | |
12217 * doc/conf/artifacts/winfo.xml: Added the exporter with CSV facet to the | |
12218 discharge_longitudinal_section state. | |
12219 | |
12220 2011-05-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12221 | |
12222 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
12223 Added code to make back jump correction work with both | |
12224 potential flow directions. | |
12225 | |
12226 2011-05-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12227 | |
12228 * src/main/resources/metadata/template.xml: | |
12229 Added data cage configuration for 'Längsschnitt'. | |
12230 | |
12231 2011-05-06 Ingo Weinzierl <ingo@intevation.de> | |
12232 | |
12233 * doc/conf/artifacts/winfo.xml: Added the missing Q facet for discharge | |
12234 longitudinal sections. | |
12235 | |
12236 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: New. A | |
12237 derived dataset to store W/Q values with corrected Ws for a kilometer | |
12238 range. | |
12239 | |
12240 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Some new | |
12241 methods and a new constructor to initialize this data object with a | |
12242 predefined set of values. | |
12243 | |
12244 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
12245 methods to retrieve the W/Q values for the 'discharge longitudinal | |
12246 section' computation. | |
12247 | |
12248 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: New | |
12249 methods to retrieve and compute data used for the 'discharge | |
12250 longitudinal section' computation. | |
12251 | |
12252 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
12253 | |
12254 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
12255 Bugfix: just write the ranges of gauges into the DESCRIBE if the | |
12256 'wq_values' data item is required. | |
12257 | |
12258 * src/main/resources/messages.properties, | |
12259 src/main/resources/messages_de_DE.properties, | |
12260 src/main/resources/messages_en.properties, | |
12261 src/main/resources/messages_de.properties: Added i18n messages used in | |
12262 the DESCRIBE of the WQAdapted state. | |
12263 | |
12264 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
12265 | |
12266 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
12267 Changed the title of the y-axis (now 'W [NN+m]'). | |
12268 | |
12269 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
12270 | |
12271 * doc/conf/artifacts/winfo.xml: Improved the transition model to reach the | |
12272 output state for creating 'discharge longitudinal section' charts. | |
12273 | |
12274 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
12275 method that returns all gauges of the selected river based on a the | |
12276 given kilometer range. | |
12277 | |
12278 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: New. | |
12279 This state creates a set of elements for the DESCRIBE that consist of a | |
12280 tuple of kilometer values. The number of elements depend on the number | |
12281 of gauges intersected by the given kilometer range. | |
12282 | |
12283 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
12284 New. This state is the output state that is reached after the 'discharge | |
12285 longitudinal section' computation has been chosen. | |
12286 | |
12287 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
12288 | |
12289 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Default | |
12290 step width between two kilometers added - if no step width is given, | |
12291 this default width is used. | |
12292 | |
12293 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
12294 | |
12295 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12296 Fixed a potential NullPointerException if there is just a single | |
12297 kilometer given to create a longitudinal section. | |
12298 | |
12299 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12300 | |
12301 * pom.xml: Added http://repository.jboss.org/maven2 repo | |
12302 to fix flys/issue30 | |
12303 | |
12304 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12305 | |
12306 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12307 To make diagram generation possible ws are now generated from qs | |
12308 because they are many ws having different qs. | |
12309 | |
12310 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
12311 | |
12312 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
12313 Fetch the WQ data from WINFO artifact and write those values into the | |
12314 CSV export. | |
12315 | |
12316 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
12317 | |
12318 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
12319 methods to compute and retrieve the data for discharge curves (computed). | |
12320 | |
12321 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
12322 Fetch the computed discharge curve data from WINFOArtifact and add the | |
12323 values into the JFreeChart dataset. | |
12324 | |
12325 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
12326 | |
12327 * doc/conf/artifacts/winfo.xml: Added new transitions and states to enable | |
12328 the WINFO artifact for computing discharge curves. | |
12329 | |
12330 * doc/conf/conf.xml: Added OutGenerators that generate computed discharge | |
12331 curves and exports for its data. | |
12332 | |
12333 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
12334 New. This state is reached if the user chose the computed discharge | |
12335 curve. | |
12336 | |
12337 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
12338 New. This is only a stub implementation at the moment. This | |
12339 OutGenerator should create computed discharge curves later. It extends | |
12340 the DischargeCurveGenerator which should do the same stuff for discharge | |
12341 curves for gauges. | |
12342 | |
12343 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
12344 New. This is only a stub implementation at the moment. This OutGenerator | |
12345 should create the exports of the discharge curve computation. | |
12346 | |
12347 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12348 | |
12349 * doc/conf/artifacts/winfo.xml: Added a new output mode for the duration | |
12350 curve state (CSV export). | |
12351 | |
12352 * doc/conf/conf.xml: Added a new OutGenerator to export duration curve | |
12353 computations. | |
12354 | |
12355 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New. | |
12356 This abstract OutGenerator represents the base class for exporting | |
12357 computed data. Currently, the CSV export is supported. | |
12358 | |
12359 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Moved | |
12360 the most code to export to CSV into the AbstractExporter. | |
12361 | |
12362 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
12363 New. This exporter exports the computed data of a duration computation. | |
12364 | |
12365 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12366 | |
12367 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12368 Modified a wrong debug statement which would confuse the user. | |
12369 | |
12370 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12371 | |
12372 * doc/conf/artifacts/winfo.xml: Added a new output mode for the waterlevel | |
12373 state (CSV export). | |
12374 | |
12375 * doc/conf/conf.xml: Added a new OutGenerator to export waterlevels. | |
12376 | |
12377 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: New. | |
12378 This OutGenerator exports the data of a waterlevel computation. Note: | |
12379 It is necessary to specify the desired facet (e.g. | |
12380 'waterlevel_export.csv'). | |
12381 | |
12382 * pom.xml: Added a dependency to OpenCSV. | |
12383 | |
12384 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12385 | |
12386 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12387 Introduced an "export" output target. If the target is "export", a | |
12388 facet (read from the incoming xml document) is a necessary parameter | |
12389 that determines which facets are written to the output. | |
12390 | |
12391 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12392 | |
12393 * src/main/resources/messages_en.properties: Bugfix: replaced german | |
12394 string (copy & paste mistake). | |
12395 | |
12396 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12397 | |
12398 * src/main/resources/messages.properties, | |
12399 src/main/resources/messages_de_DE.properties, | |
12400 src/main/resources/messages_en.properties, | |
12401 src/main/resources/messages_de.properties: Added new i18n strings for | |
12402 for the location selection. | |
12403 | |
12404 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
12405 | |
12406 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
12407 New. An OutGenerator for creating duration curves. | |
12408 | |
12409 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: New. A | |
12410 model class to store necessary data for creating W and Q facets of a | |
12411 duration curve. This model stores W, Q and Days. | |
12412 | |
12413 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
12414 Added a function to retrieve tuples of (day, q) based on a given gauge - | |
12415 these tuples are necessary for creating duration curves. | |
12416 | |
12417 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
12418 methods to compute and retrieve the data necessary for creating duration | |
12419 curves. | |
12420 | |
12421 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
12422 Bugfix: improved the access to the location array (avoid | |
12423 NullPointerException). | |
12424 | |
12425 * doc/conf/conf.xml: Registered the new OutGenerator for duration curves. | |
12426 | |
12427 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12428 | |
12429 * contrib/visualize-transitions.xsl: State quoting was done wrong. | |
12430 | |
12431 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12432 | |
12433 * doc/conf/artifacts/winfo.xml: Enhanced the transition model to reach the | |
12434 final state for creating duration curves. | |
12435 | |
12436 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
12437 New. This state should be reached to just insert an array of locations. | |
12438 | |
12439 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: | |
12440 New. This state is reached if the duration curve calculation is | |
12441 selected. | |
12442 | |
12443 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adjusted | |
12444 getDistance() so that it takes care on inserted locations - not just | |
12445 inserted ranges. | |
12446 | |
12447 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12448 | |
12449 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
12450 Flush/persist caches at program exists. | |
12451 | |
12452 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12453 Commented out too eloquent debug output. | |
12454 | |
12455 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12456 | |
12457 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12458 Uses the methods of FLYSArtifact to retrieve the necessary information | |
12459 rivername and selected distance. | |
12460 | |
12461 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12462 | |
12463 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12464 Added interpolateW method to take reference to result ws array | |
12465 as an argument to avoid expensive array allocations in km iterating | |
12466 loops. | |
12467 | |
12468 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
12469 Added a constructor to create backing trove datastructure | |
12470 with the right capacity. | |
12471 | |
12472 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
12473 Move allocation of result ws out of km loop. | |
12474 | |
12475 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12476 | |
12477 * doc/conf/artifacts/winfo.xml: Added two further data items in the WQ | |
12478 selection state. Those items are necessary to store the information | |
12479 about the selected mode (range/single selection) and the values of the | |
12480 single selection. | |
12481 | |
12482 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: If | |
12483 there is no value for a data item, this item is not written into the | |
12484 static DESCRIBE part. | |
12485 | |
12486 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
12487 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
12488 Renamed the method to validate upper and lower values. | |
12489 | |
12490 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
12491 state can now handle values inserted in the single selection. Therefore, | |
12492 new validate methods has been added. | |
12493 | |
12494 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
12495 methods getWs() and getWs() take care on the values inserted in the | |
12496 single insert mode of the client which enables the user to insert single | |
12497 W and Q. | |
12498 | |
12499 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12500 | |
12501 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12502 Repaired getQForW() by calculating indices on right dimension. | |
12503 | |
12504 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12505 | |
12506 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
12507 methods for retrieving selected W values (getWs()). | |
12508 | |
12509 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
12510 method for retrieving waterlevel data takes care on selected Ws, now. | |
12511 The selected Ws are transformed using the DischargeTables.getQForW() | |
12512 into Q values. | |
12513 | |
12514 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12515 | |
12516 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12517 Removed an unused parameter 'result' of getQForW(). | |
12518 | |
12519 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12520 | |
12521 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Removed | |
12522 the getDataset() method and replaced it with a addDataset() method. | |
12523 On this way, concrete subclasses of this OutGenerator can have multiple | |
12524 datasets (e.g. different datasets for W and Q). This abstract method is | |
12525 called after the chart generation is finished. | |
12526 | |
12527 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12528 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12529 Both classes implement the addDataset() method. The | |
12530 LongitudinalSectionGenerator has already multiple datasets for W and Q. | |
12531 Both are added to the chart - both have an own range axis. | |
12532 | |
12533 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12534 | |
12535 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12536 Use the cache for the wst value table if configured. | |
12537 | |
12538 * doc/conf/cache.xml: Choose a more precise name for the | |
12539 wst value table cache. | |
12540 | |
12541 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12542 | |
12543 * pom.xml: Added dependency to Ehcache. Apache 2.0 license. | |
12544 | |
12545 * doc/conf/conf.xml: Added configuration of ehcache. | |
12546 | |
12547 * doc/conf/cache.xml: New. Cache configurations. | |
12548 | |
12549 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
12550 New. Factory to access caches. | |
12551 | |
12552 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12553 | |
12554 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12555 Forgot to add. | |
12556 | |
12557 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
12558 New. Given a database connection and a XML template it generates | |
12559 an output with meta data about the database. | |
12560 | |
12561 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
12562 New. Holds prepared statements optimized to be run in the stack of | |
12563 contextes. | |
12564 | |
12565 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
12566 New. Model to hold a hierarchical scope of variables. | |
12567 | |
12568 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
12569 New. Stores data set fetched from a sql select to be iterated in | |
12570 a context. | |
12571 | |
12572 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
12573 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12574 Removed superfluous imports. | |
12575 | |
12576 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12577 | |
12578 * doc/conf/conf.xml: Added meta data service. | |
12579 | |
12580 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12581 Stub for the meta data service. | |
12582 | |
12583 * src/main/resources/metadata/template.xml: Initial template for | |
12584 the meta data service. | |
12585 | |
12586 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12587 | |
12588 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12589 Bugfix: Now, curves for Q values are drawn into a longitudinal section | |
12590 chart as well. Therefore, it was necessary to change the datastructure | |
12591 of the inner class ThemeList that stores all themes included in a chart | |
12592 in an ordered list (stored in a java.util.Vector now). | |
12593 | |
12594 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12595 | |
12596 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: New. An | |
12597 abstract base class for ChartGenerators that create XY charts. | |
12598 | |
12599 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12600 Sourced the generate() method out to the XYChartGenerator. | |
12601 | |
12602 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12603 Implemented the methods to add W and Q facets to the chart. | |
12604 | |
12605 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12606 | |
12607 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Improved | |
12608 the calculation of the step with for ranges. | |
12609 | |
12610 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12611 | |
12612 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Added a | |
12613 method that returns the number of elements stored in the data pool. | |
12614 | |
12615 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12616 | |
12617 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
12618 Added a get() method which takes destination array as an | |
12619 argument. | |
12620 | |
12621 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12622 | |
12623 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Changed the | |
12624 data structure to store w, q and kms values from List<Double> to | |
12625 TDoubleArrayList which stores native double values instead of big | |
12626 Double values. | |
12627 | |
12628 * pom.xml: Added the GNU Trove dependency. | |
12629 | |
12630 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12631 | |
12632 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added the | |
12633 name a the requested facet to doOut(). Concrete generators should just | |
12634 create output for this facet now. | |
12635 | |
12636 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
12637 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12638 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12639 Adapted the method signature of doOut(). | |
12640 | |
12641 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12642 Adapted the method call of OutGenerator.doOut(). | |
12643 | |
12644 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12645 | |
12646 * doc/conf/themes.xml: Added mappings for the facets | |
12647 longitudinal.section.w and longitudinal.section.q. | |
12648 | |
12649 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12650 | |
12651 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added some | |
12652 methods to retrieve necessary information for computing the data of a | |
12653 waterlevel. | |
12654 | |
12655 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
12656 methods to compute and retrieve the data of a waterlevel computation. | |
12657 | |
12658 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12659 | |
12660 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: New. This | |
12661 model class represents a pool of data triples that consist of W, Q and | |
12662 Kms information. This class might be used to compute data for creating | |
12663 longitudinal section curves (which are based on those W, Q and Kms | |
12664 values). | |
12665 | |
12666 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12667 | |
12668 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12669 Bugfix: Removed endless loop and a bug while iterating over Hibernate | |
12670 results. | |
12671 | |
12672 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12673 | |
12674 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12675 New. An OutGenerator that creates longitudinal section curves. | |
12676 | |
12677 NOTE: This is just the stub - the out creation needs to be implemented! | |
12678 | |
12679 * doc/conf/conf.xml: Added the LongitudinalSectionGenerator. | |
12680 | |
12681 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12682 | |
12683 * doc/conf/conf.xml: Bugfix: Added missing <output-generators> section. | |
12684 | |
12685 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12686 | |
12687 * src/main/java/de/intevation/flys/artifacts/WaterlevelState.java: New. | |
12688 This state should be reached if the 'calc.surface.curve' calculation | |
12689 method has been chosen. | |
12690 | |
12691 * doc/conf/artifacts/winfo.xml: Modified a transition and added the | |
12692 WaterlevelState. This state is reached if the 'calc.surface.curve' | |
12693 calculation method has been chosen. It currently has 1 output - a | |
12694 longitudinal section that is not implemented yet! | |
12695 | |
12696 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12697 | |
12698 * src/main/java/de/intevation/flys/artifacts/transitions/ValueCompareTransition.java: | |
12699 New. This transition is valid if the a data object of the current | |
12700 artifact equals/notequals a configured value in the transition model. | |
12701 | |
12702 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12703 | |
12704 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
12705 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Bugfixes: | |
12706 - Adapted the parameters of the isStateReachable() call - added the | |
12707 artifact and the current state. | |
12708 - Append the outputs of a current state if the state is filled with | |
12709 valid data. | |
12710 | |
12711 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12712 | |
12713 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
12714 Added the missing init() method that has been introduced in the | |
12715 interface some commits ealier. | |
12716 | |
12717 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
12718 Call init() after a Transition has been created. | |
12719 | |
12720 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12721 | |
12722 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
12723 Bugfix: Introduced a <art:outputs> node in the attribute document of a | |
12724 Collection that contains further <art:output> nodes - instead of having | |
12725 multiple <art:output> nodes at toplevel of the document. | |
12726 | |
12727 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12728 Adapted the XPath to retrieve the outputs in the attribute document of a | |
12729 Collection. | |
12730 | |
12731 2011-04-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12732 | |
12733 * contrib/visualize-transitions.xsl: Added to create a | |
12734 Graphviz digraph out of the config.xml. Usage: | |
12735 | |
12736 $ xsltproc --stringparam base-dir ../doc/conf/ \ | |
12737 contrib/visualize-transitions.xsl \ | |
12738 doc/conf/conf.xml > transitions.dot | |
12739 | |
12740 $ dot -Tsvg -o transitions.svg transitions.dot | |
12741 | |
12742 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12743 | |
12744 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
12745 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
12746 If no data has been inserted so far, an IllegalArgumentException is | |
12747 thrown. | |
12748 | |
12749 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12750 | |
12751 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:: | |
12752 A lot of new methods to retrieve the theme of a facet - used while | |
12753 creating the output of a facet/artifact. If a facet has no theme yet, it | |
12754 is initialized. | |
12755 | |
12756 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12757 | |
12758 * src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
12759 src/main/java/de/intevation/flys/collections/OutputParser.java: Removed | |
12760 useless imports. | |
12761 | |
12762 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12763 | |
12764 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: New. An | |
12765 abstract OutGenerator that might be used to create chart output. Some | |
12766 basic things that are equal in all charts should be done here! | |
12767 | |
12768 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12769 This OutGenerator no longer implements the OutGenerator directly, but it | |
12770 extends the ChartGenerator now. | |
12771 | |
12772 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12773 | |
12774 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12775 Restructured the out() operation of a collection: Now, we collect a list | |
12776 of artifacts/facets and use this for the OutGenerator. Its doOut() | |
12777 method gets the attribute of an artifact - the position and the active | |
12778 state is managed by the Collection itself. | |
12779 | |
12780 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
12781 | |
12782 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: New. | |
12783 a specialized facet that stores information about its position and its | |
12784 state (active/inactive) in an output of a collection. | |
12785 | |
12786 * src/main/java/de/intevation/flys/collections/AttributeParser.java: New. | |
12787 This parser takes the attributes (XML) of a collection and extracts the | |
12788 contained outputs with its facets. The result is a Map<String, Output>. | |
12789 | |
12790 * src/main/java/de/intevation/flys/collections/OutputParser.java: New. | |
12791 This parser is used to query the artifact's DESCRIBE and to extract the | |
12792 supported outputs. The result is a Map<String, Output>. | |
12793 | |
12794 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: New. | |
12795 This writer merges the outputs contained in an attribute of a collection | |
12796 with the outputs of a collection's artifacts. | |
12797 | |
12798 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12799 The attributes of a collection are written into its DESCRIBE document | |
12800 now. The OutputParser and AttributeParser are used to read the supported | |
12801 attributes by the collection and its artifacts - the AttributeWriter is | |
12802 used to merge both attributes and create a final attribute document. | |
12803 | |
12804 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
12805 | |
12806 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java, | |
12807 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
12808 The facet-2-theme mappings are initialized at startup and stored in the | |
12809 FLYSContext. | |
12810 | |
12811 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Added a | |
12812 function that retrieves a theme from FLYSContext based on its name. | |
12813 | |
12814 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12815 | |
12816 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12817 Corrected a silly c&p mistake. | |
12818 | |
12819 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12820 | |
12821 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
12822 | |
12823 Implementation of the "Ruecksprungkorrektur" to be done in | |
12824 "W fuer angepassten Abflusslaengschnitt". | |
12825 | |
12826 All tests show the expected results. In some corner cases the | |
12827 algorithm described in the "Anwenderhandbuch" chapter 3.3.4.3 "Korrektur" | |
12828 has some definition shortcomings: | |
12829 | |
12830 a - What should happend when you cannot find point 2 because | |
12831 you cannot step back one quarter from point 3 because there | |
12832 is no data there any more (river too short in this direction)? | |
12833 The implemented algorithm raises point 3' only to an | |
12834 according factor. E.g. If you can step back the whole quarter | |
12835 distance the elevation is the full quarter. If you can | |
12836 step back only the half of the quarter the elevation is | |
12837 only an eighth. | |
12838 | |
12839 b - If the water heights between point 2 and 3 are constant then | |
12840 the algorithm will produce a spline interpolation that | |
12841 lowers those values. Is this intended? | |
12842 | |
12843 For real data the back jumps are expected to be more in the middle | |
12844 of the distance ranges so the corner cases are maybe not so | |
12845 important. | |
12846 | |
12847 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
12848 Removed superfluous import. | |
12849 | |
12850 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12851 | |
12852 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Removed debug | |
12853 code that has been commited by accident. | |
12854 | |
12855 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12856 | |
12857 * doc/conf/themes.xml: New. A first small theme configuration. | |
12858 | |
12859 * doc/conf/conf.xml: Added a link to the theme configuration. | |
12860 | |
12861 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
12862 Defined a key that is used to store a themes map in the FLYSContext. | |
12863 | |
12864 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
12865 The theme configuration is read at startup and the themes are stores in | |
12866 the FLYSContext. | |
12867 | |
12868 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12869 | |
12870 * src/main/java/de/intevation/flys/themes/Theme.java, | |
12871 src/main/java/de/intevation/flys/themes/DefaultTheme.java: | |
12872 New. The interface and its default implementation that represents themes | |
12873 used to style charts and maps. | |
12874 | |
12875 * src/main/java/de/intevation/flys/themes/ThemeField.java, | |
12876 src/main/java/de/intevation/flys/themes/DefaultThemeField.java: | |
12877 New. The interface and its default implementation that represents fields | |
12878 in themes. A theme might be "Lines" and one of its field might be | |
12879 "Color" or "Size". | |
12880 | |
12881 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: A factory | |
12882 that creates new themes based on a theme configuration. | |
12883 | |
12884 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12885 | |
12886 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12887 Implementation of "Abflusskurve/Abflusstafel" calculation. | |
12888 | |
12889 Added method interpolateWQ() which takes an km and results in a | |
12890 tuple of two double arrays containing the w/q values interpolated | |
12891 between the surrounding w/q values of the table. | |
12892 w values are interpolated linear, q values with a cubic spline. | |
12893 | |
12894 Drawing w over q gives you the discharge table at the given km. | |
12895 | |
12896 !!! This code needs testing !!! | |
12897 | |
12898 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12899 | |
12900 * pom.xml: Added dependency to Apache Commons Math 2.2 (Apache License 2.0) | |
12901 | |
12902 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12903 | |
12904 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12905 Fix problem when sorting by q (copied w instead of q). | |
12906 | |
12907 2011-04-20 Ingo Weinzierl <ingo@intevation.de> | |
12908 | |
12909 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12910 Fixed broken HQL statement. | |
12911 | |
12912 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12913 | |
12914 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12915 add a method interpolateW() which takes an array of | |
12916 q values and returns an equal sized array of w values. | |
12917 This is essentially the "Wasserstand/Wasserspiegellagen" calculation | |
12918 of desktop FLYS. | |
12919 | |
12920 If you want to do a calculation with given w values you have | |
12921 to convert the w values with DischargeTables.getQForW() first. | |
12922 | |
12923 !!! This code needs heavy testing !!! | |
12924 | |
12925 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12926 | |
12927 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12928 We need a getQForW() method and not getWForQ() because when | |
12929 doing a "Wasserstand/Wasserspiegellagen" calculation with given | |
12930 w values these values need to be translated to q values with | |
12931 the master discharge table. | |
12932 | |
12933 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12934 | |
12935 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12936 Sorting of q values was done wrong. | |
12937 | |
12938 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12939 | |
12940 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
12941 Ordered the list of annotations returned by this factory based on its | |
12942 range. | |
12943 | |
12944 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12945 | |
12946 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
12947 New. This service returns an XML document that includes the main values | |
12948 of a gauge based on a river name, a start and an end point. | |
12949 | |
12950 * doc/conf/conf.xml: Registered the MainValuesService. | |
12951 | |
12952 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12953 | |
12954 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
12955 A factory that provides methods to return MainValues. | |
12956 | |
12957 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12958 | |
12959 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12960 Added static method getWForQ() to interpolate a w value for | |
12961 a given q value based on a given discharge table. | |
12962 | |
12963 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12964 | |
12965 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12966 Added convenience constructors/methods to ease the access to the master | |
12967 discharge table of a gauge. | |
12968 | |
12969 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12970 | |
12971 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12972 Moved the query complexity into view 'wst_value_table' and | |
12973 used this instead. | |
12974 | |
12975 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12976 | |
12977 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12978 Fetches w/q value tables from the backend. TODO: Move this | |
12979 to the backend and use a view. | |
12980 | |
12981 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12982 | |
12983 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
12984 the error key that is thrown if no input data was found so that the key | |
12985 is usable for GWT's i18n mechanism. | |
12986 | |
12987 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12988 | |
12989 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
12990 The inserted river is validated now (overrides validate() of | |
12991 DefaultState). | |
12992 | |
12993 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12994 | |
12995 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
12996 The inserted calculation method is validated now (overrides validate() | |
12997 of DefaultState). | |
12998 | |
12999 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
13000 | |
13001 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13002 The input data of feed() are validated using the DefaultStates | |
13003 validate() method. | |
13004 | |
13005 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13006 New method validate() that needs to be overidden by concrete subclasses. | |
13007 It should return true, if the data of the State is fine, otherwise it | |
13008 should raise an exception. | |
13009 | |
13010 NOTE: The exceptions are not translated in the server but in the client! | |
13011 | |
13012 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: New. | |
13013 This abstract class exists to provide some methods for handling ranges. | |
13014 Currently, there is a method that validates a given range based on | |
13015 min/max values. | |
13016 | |
13017 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
13018 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
13019 Implemented input data validation for ranges. | |
13020 | |
13021 NOTE: The input validation of concrete values has not been implemented | |
13022 yet! | |
13023 | |
13024 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
13025 | |
13026 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13027 Removed debug code that has been commited by accident :-/ | |
13028 | |
13029 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
13030 | |
13031 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
13032 getGauge() method returns the first gauge based on the given start and | |
13033 end point of the river. | |
13034 | |
13035 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
13036 Fixed potential bugs: if no gauge could be determined, the default | |
13037 values for W and Q are the minimum and maximum double values. | |
13038 | |
13039 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
13040 | |
13041 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fills | |
13042 the DESCRIBE with default values for W and Q. | |
13043 | |
13044 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
13045 | |
13046 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
13047 New. Returns Wst object - based on a river. | |
13048 | |
13049 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
13050 | |
13051 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Now | |
13052 provides some methods that return some basic objects inserted while | |
13053 parameterization: River, Gauge and so on. | |
13054 | |
13055 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
13056 | |
13057 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
13058 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13059 Bugfix: Repaired broken imports of the SessionHolder. | |
13060 | |
13061 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
13062 | |
13063 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
13064 Moved this class to flys-backend. | |
13065 | |
13066 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
13067 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
13068 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
13069 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, | |
13070 src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
13071 Adapted imports of the SessionHolder. | |
13072 | |
13073 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13074 | |
13075 * trunk/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
13076 trunk/src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13077 Acquire/release sessions in services to avoid db connection leaks. | |
13078 | |
13079 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13080 | |
13081 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13082 Changed some method signatures - added a reference to the owner | |
13083 Artifact. | |
13084 | |
13085 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
13086 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
13087 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
13088 Modified method signatures based on the changes in DefaultState. | |
13089 | |
13090 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
13091 Added default values to the dynamic part of DESCRIBE. | |
13092 | |
13093 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13094 | |
13095 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
13096 Added a function that returns a River object based on a given river | |
13097 name. | |
13098 | |
13099 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13100 | |
13101 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
13102 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
13103 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
13104 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
13105 Static methods are using the SessionHolder, too. | |
13106 | |
13107 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13108 | |
13109 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
13110 Added the setup() method that has been added to the interface | |
13111 description in the last commits. | |
13112 | |
13113 * doc/conf/conf.xml: Registered the SessionCallContextListener as | |
13114 CallContext.Listener. | |
13115 | |
13116 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13117 | |
13118 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
13119 Bugfix: Call correct method to retrieve an instance of | |
13120 SessionFactoryProvider. | |
13121 | |
13122 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13123 | |
13124 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
13125 New. Contains thread local session holder for hibernate sessions. | |
13126 | |
13127 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
13128 Uses session from SessionHolder. | |
13129 | |
13130 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
13131 Interacts with SessionHolder now. | |
13132 | |
13133 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
13134 Removed superfluous import. | |
13135 | |
13136 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13137 | |
13138 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
13139 Implementation of a CallContext.Listener to open/close Hibernate | |
13140 Sessions for each request. | |
13141 | |
13142 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13143 | |
13144 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
13145 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13146 Some modifications related to the last commit - modification of the | |
13147 describe() signature of a State. | |
13148 | |
13149 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
13150 | |
13151 * src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: | |
13152 Removed. We do not need a state to select a gauge - the selection takes | |
13153 place by choosing a start and an end point. | |
13154 | |
13155 2011-04-13 Ingo Weinzierl <ingo@intevation.de> | |
13156 | |
13157 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13158 Bugfix: added missing label node to root node and a namespace to the | |
13159 data node. | |
13160 | |
13161 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
13162 | |
13163 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
13164 The name of the artifact 'winfo' is written into the DESCRIBE document | |
13165 now. We need this to have a proper way to distinguish between different | |
13166 artifacts in the UI. | |
13167 | |
13168 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
13169 | |
13170 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Bugfix: | |
13171 States are filled with data before they describe themself. | |
13172 | |
13173 2011-04-11 Ingo Weinzierl <ingo@intevation.de> | |
13174 | |
13175 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
13176 New. A factory that returns the annotations of a specific river. | |
13177 | |
13178 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
13179 New. This service provides a document that contains information about | |
13180 distances of a river. | |
13181 | |
13182 * doc/conf/conf.xml: Registered the DistanceInfoService. | |
13183 | |
13184 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
13185 | |
13186 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13187 This collection overrides the out() operation now. The incoming request | |
13188 document is read and the related OutGenerator is used to create the | |
13189 output. | |
13190 | |
13191 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
13192 the code to create discharge curves. It has moved to the | |
13193 DischargeCurveGenerator which now does this work. | |
13194 | |
13195 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
13196 | |
13197 * src/main/java/de/intevation/flys/exports/OutGenerator.java: The | |
13198 generate() method throws an IOException now. | |
13199 | |
13200 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
13201 New. This OutGenerator creates discharge curves. | |
13202 | |
13203 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
13204 | |
13205 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
13206 the visibility of the getData() method. It's now public, because the | |
13207 OutGenerator needs an artifact's data. | |
13208 | |
13209 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13210 | |
13211 * src/**/*.java: Removed trailing whitespace. | |
13212 | |
13213 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13214 | |
13215 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13216 Make project compilable again by | |
13217 commenting out a not existing XMLDebug reference. | |
13218 | |
13219 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
13220 | |
13221 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13222 Added code to parse the configured OutGenerators and to save them (in a | |
13223 map) in the FLYSContext. | |
13224 | |
13225 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
13226 Added a key that is used to save the OutGenerators Map in the context. | |
13227 | |
13228 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
13229 | |
13230 * src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
13231 New. This interface is used to generator different types of output. | |
13232 ArtifactCollections will make use of this interface to create a | |
13233 collected output of all its artifacts. | |
13234 | |
13235 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
13236 | |
13237 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13238 Removed the Backend from FLYSArtifactCollection - used ArtifactDatabase | |
13239 operations instead. | |
13240 | |
13241 * TODO: Removed 'remove Backend reference' TODO. | |
13242 | |
13243 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
13244 | |
13245 * doc/conf/artifacts/winfo.xml: Enhanced the configuration of the | |
13246 discharge curve output mode. This output now provides three facets - W, | |
13247 Q and the curve itself. | |
13248 | |
13249 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
13250 | |
13251 Tagged RELEASE 0.1 | |
13252 | |
13253 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
13254 | |
13255 * doc/conf/artifacts/winfo.xml: Renamed an output mode in the WINFO | |
13256 artifact configuration. | |
13257 | |
13258 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
13259 | |
13260 * src/main/resources/messages_de_DE.properties, | |
13261 src/main/resources/messages_de.properties: Changed a german string. | |
13262 | |
13263 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
13264 | |
13265 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
13266 Modified the available calculation modes and its order in the DESCRIBE | |
13267 document. | |
13268 | |
13269 * src/main/resources/messages.properties, | |
13270 src/main/resources/messages_de_DE.properties, | |
13271 src/main/resources/messages_en.properties, | |
13272 src/main/resources/messages_de.properties: Adapted the names of | |
13273 calculation modes. | |
13274 | |
13275 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
13276 | |
13277 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13278 Added the hash code of an artifact to the artifact part of the | |
13279 collection's DESCRIBE document. | |
13280 | |
13281 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
13282 | |
13283 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Changed | |
13284 the background color of discharge curves to white. | |
13285 | |
13286 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13287 | |
13288 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
13289 Cache the scale, too. Otherwise two calls to getValues() with | |
13290 different arguments will result in the same output. | |
13291 | |
13292 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
13293 | |
13294 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
13295 Introduced a 'scale' parameter in the getValues() method. | |
13296 | |
13297 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Filled | |
13298 the out() operation with code that draws a discharge table of one or | |
13299 more gauges specified by the given range in entered in a previous state. | |
13300 | |
13301 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
13302 | |
13303 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
13304 New. A helper class to exports charts. | |
13305 | |
13306 * pom.xml: Added dependencies to iText, Batik and JFreeChart. | |
13307 | |
13308 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13309 | |
13310 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
13311 Fixed swap of operands. | |
13312 | |
13313 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13314 | |
13315 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
13316 New. Load gauges for a river and filter them for given | |
13317 ranges. | |
13318 | |
13319 2011-03-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13320 | |
13321 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
13322 Store data in a double [][] instead of interleaved double [] | |
13323 to be compatible with org.jfree.data.xy.DefaultXYDataset. | |
13324 | |
13325 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
13326 | |
13327 * TODO: Removed 'i18n' and 'step-back' TODOs and added an issue to remove | |
13328 the Backend reference from FLYSArtifactCollection. | |
13329 | |
13330 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
13331 | |
13332 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13333 Added missing artifact namespace of an attribute in the DESCRIBE | |
13334 document. | |
13335 | |
13336 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
13337 | |
13338 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
13339 New. This ArtifactCollection overrides the DefaultArtifactCollection to | |
13340 implement FLYS specific describe() and out() operations. | |
13341 | |
13342 * doc/conf/conf.xml: Use the FLYSArtifactCollection instead of the | |
13343 DefaultArtifactCollection for this application. | |
13344 | |
13345 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13346 | |
13347 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
13348 New. Fetches values of discharge tables in form of packed | |
13349 w/q double arrays for given gauges. | |
13350 | |
13351 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
13352 Removed needless import. | |
13353 | |
13354 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
13355 | |
13356 * src/main/resources/messages_de_DE.properties: Added a german resource | |
13357 bundle to avoid exceptions in the flys artifacts. Sometimes, the | |
13358 Resources class is not able to find a 'de_DE' bundle and throws an | |
13359 exception. This is really strange, because it should use the 'de' bundle | |
13360 in that case, but it doesn't. | |
13361 | |
13362 2011-03-23 Ingo Weinzierl <ingo@intevation.de> | |
13363 | |
13364 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
13365 some code to append the output modes of previous states to the DESCRIBE | |
13366 document. | |
13367 | |
13368 TODO: Determine if the current state is already filled with data and | |
13369 append its output modes as well! | |
13370 | |
13371 2011-03-22 Ingo Weinzierl <ingo@intevation.de> | |
13372 | |
13373 * doc/conf/artifacts/winfo.xml: Enhanced the location_distance state with | |
13374 an output mode 'discharge_table'. | |
13375 | |
13376 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
13377 | |
13378 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13379 Write human readable strings as label attribute into the DESCRIBE | |
13380 output. Those labels are used to be displayed in the GUI. | |
13381 | |
13382 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
13383 | |
13384 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
13385 Added some further calculation types. | |
13386 | |
13387 * src/main/resources/messages.properties, | |
13388 src/main/resources/messages_en.properties, | |
13389 src/main/resources/messages_de.properties: Added i18n strings for the | |
13390 calculation types | |
13391 | |
13392 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
13393 | |
13394 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13395 Implemented the step-back part of the advance() operation. | |
13396 | |
13397 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
13398 | |
13399 * src/main/resources/messages_de.properties: Fixed a german umlaut. | |
13400 | |
13401 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
13402 | |
13403 * doc/conf/artifacts/winfo.xml: Added new states for entering a | |
13404 location/distance and w/q. | |
13405 | |
13406 * src/main/resources/messages.properties, | |
13407 src/main/resources/messages_en.properties, | |
13408 src/main/resources/messages_de.properties: New string for the | |
13409 location/distance and w/q input states. | |
13410 | |
13411 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
13412 | |
13413 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
13414 New. A state for the W/Q input of the WINFO parameterization. | |
13415 | |
13416 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
13417 | |
13418 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13419 Append an attribute 'uiprovider' to the dynamic UI node. | |
13420 | |
13421 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
13422 New. A state for the location/distance selection of the WINFO | |
13423 parameterization. | |
13424 | |
13425 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13426 | |
13427 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13428 Added a new method getUIProvider() that might be overriden by concreted | |
13429 subclasses that should be rendered with a specific UIProvider. | |
13430 | |
13431 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13432 | |
13433 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
13434 The static UI part is created by the previous states now. This makes it | |
13435 possible to group the data objects (which is necessary to group the | |
13436 objects in the ui). | |
13437 | |
13438 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13439 Added a describeStatic() method that creates a node that contains the | |
13440 data of that state. | |
13441 | |
13442 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13443 | |
13444 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13445 Removed TODO: the document contains the rivers provided by the backend | |
13446 now. | |
13447 | |
13448 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13449 | |
13450 * pom.xml: Added dependency to flys backend. | |
13451 | |
13452 * src/main/java/de/intevation/flys/artifacts/model/River.java: | |
13453 Removed. We are using the backend model now. | |
13454 | |
13455 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
13456 Fetches the rivers from the backend. | |
13457 | |
13458 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13459 Import fixes. | |
13460 | |
13461 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13462 | |
13463 * doc/conf/conf.xml: Added section for database backend configuration. | |
13464 | |
13465 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13466 | |
13467 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13468 Fixed build error coming from different import of XMLUtils. | |
13469 | |
13470 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13471 | |
13472 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13473 Appended the missing label node that contains the human readable name of | |
13474 the data item. | |
13475 | |
13476 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13477 | |
13478 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
13479 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13480 I18N of strings for the DESCRIBE document. | |
13481 | |
13482 * src/main/resources/messages.properties, | |
13483 src/main/resources/messages_en.properties, | |
13484 src/main/resources/messages_de.properties: I18N strings for the | |
13485 calculcation mode state. | |
13486 | |
13487 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13488 | |
13489 * doc/conf/artifacts/winfo.xml: Modified the winfo states. | |
13490 | |
13491 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Adapted | |
13492 the artifact regarding the changes of the last commit. The states | |
13493 describe() method creates the dynamic UI node - the artifact needs to | |
13494 apply this node. | |
13495 | |
13496 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
13497 New. The state for choosing the calculation mode. | |
13498 | |
13499 * src/main/resources/messages.properties, | |
13500 src/main/resources/messages_en.properties, | |
13501 src/main/resources/messages_de.properties: Added i18n strings for the | |
13502 calculation mode state. | |
13503 | |
13504 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13505 | |
13506 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13507 New. This is the base state for the FLYS application. It provides a | |
13508 method that creates the dynamic ui node for the DESCRIBE. | |
13509 | |
13510 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
13511 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: Both | |
13512 classes extend the abstract base class DefaultState. | |
13513 | |
13514 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13515 | |
13516 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
13517 New. This class retrieves the i18n strings from a ResourceBundle. | |
13518 | |
13519 * src/main/resources/messages.properties, | |
13520 src/main/resources/messages_en.properties, | |
13521 src/main/resources/messages_de.properties: Resource files for german and | |
13522 english translation. | |
13523 | |
13524 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13525 | |
13526 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
13527 the data that have been inserted in former states into the static node | |
13528 of the DESCRIBE. | |
13529 | |
13530 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13531 | |
13532 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
13533 operations feed() and advance() return the description of the artifact | |
13534 using the describe() operation. This avoids additional server round trips | |
13535 in the client - the clients gets to know about the new state of the | |
13536 artifact immediately. | |
13537 | |
13538 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13539 | |
13540 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13541 Implemented a part (step forward) of the advance operation. | |
13542 | |
13543 * TODO: Implement Step-Back in advance operation. | |
13544 | |
13545 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13546 | |
13547 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
13548 Implemented the abstract method getName(). It returns the constant | |
13549 'winfo' string. | |
13550 | |
13551 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13552 Implemented the feed action. The data of an incoming feed() operation is | |
13553 stored in StateData objects that are saved in a map in the artifact. | |
13554 | |
13555 NOTE: There is no input validation and no i18n of error messages (see | |
13556 TODO). | |
13557 | |
13558 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13559 | |
13560 * TODO: This file contains some open points that need to be done. | |
13561 | |
13562 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13563 | |
13564 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New. This | |
13565 artifact serves as the default artifact for the FLYS application. | |
13566 | |
13567 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: This | |
13568 artifact now inherits from FLYSArtifact. Furthermore, there is one big | |
13569 change: we don't store the State objects itself in the artifact, but | |
13570 just the identifier of those. This makes the artifact smaller and more | |
13571 compatible agains previous versions of the software. | |
13572 | |
13573 2011-03-08 Ingo Weinzierl <ingo@intevation.de> | |
13574 | |
13575 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13576 New. This service will retrieve a list of provided rivers. | |
13577 | |
13578 * doc/conf/conf.xml: Added a configuration for the RiverService. | |
13579 | |
13580 2011-03-07 Ingo Weinzierl <ingo@intevation.de> | |
13581 | |
13582 * doc/conf/conf.xml: Added a section user-factory and collection-factory in | |
13583 the factories part of the configuration. | |
13584 | |
13585 2011-03-01 Ingo Weinzierl <ingo@intevation.de> | |
13586 | |
13587 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13588 Replaced the 'special' attribute from DESCRIBE with a 'uiprovider' | |
13589 attribute. | |
13590 | |
13591 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
13592 | |
13593 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
13594 RiverSelect state is called to create the UI part of the describe | |
13595 document. | |
13596 | |
13597 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13598 Implemented the dynamic UI part of describe(). The static part is not | |
13599 inserted into the describe document at the moment. We need a reference to | |
13600 the previous states for this. | |
13601 | |
13602 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
13603 | |
13604 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
13605 src/main/java/de/intevation/flys/artifacts/model/River.java: New. A model | |
13606 class that represents a river and its factory to create concrete river | |
13607 instances. | |
13608 NOTE: Currently, this is just a mockup. The factory just returns two | |
13609 static rivers "Mosel" and "Saar" without a connection to a backend. | |
13610 | |
13611 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13612 | |
13613 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: The | |
13614 input data of a state is initialized with empty StateData objects after | |
13615 the State has been created. | |
13616 | |
13617 * doc/conf/artifacts/winfo.xml: Renamed the input data nodes of the states | |
13618 which now fits better to the class name of the implementation. | |
13619 | |
13620 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13621 | |
13622 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
13623 describe document returned by this artifact now contains the current state | |
13624 and the reachable states. | |
13625 | |
13626 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13627 | |
13628 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13629 The transitions are put into the TransitionEngine with the ID of the state | |
13630 - not longer with the artifact name. On this way, we are able to fetch | |
13631 just the transitions for a specific state, instead of all the transitions | |
13632 of an artifact. | |
13633 | |
13634 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13635 | |
13636 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Describe() | |
13637 returns the artifact's uuid and hash value. The whole implementation of | |
13638 describe() is still outstanding. | |
13639 | |
13640 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13641 | |
13642 * doc/conf/artifacts/winfo.xml: Removed useless config stuff. | |
13643 | |
13644 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
13645 useless methods, and improved the init process - the first state is set as | |
13646 the current state for this artifact. | |
13647 | |
13648 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
13649 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: New. | |
13650 The states are used in the first two steps of the WINFOArtifact. | |
13651 Currently, they just implement stubs of the necessary methods setup() and | |
13652 describe(). | |
13653 | |
13654 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13655 | |
13656 * src/main/java/de/intevation/flys/artifacts/states/State.java, | |
13657 src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java, | |
13658 src/main/java/de/intevation/flys/artifacts/transitions/Transition.java: | |
13659 Removed. These classes are placed in the artifact-database now. | |
13660 | |
13661 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java, | |
13662 src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
13663 Adapted imports of Transition. | |
13664 | |
13665 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: New. | |
13666 This factory should be used to create concrete State objects. | |
13667 | |
13668 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
13669 a constant key to store the StateEngine in the context. | |
13670 | |
13671 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13672 New method that initializes the states at application start. | |
13673 | |
13674 2011-02-03 Ingo Weinzierl <ingo@intevation.de> | |
13675 | |
13676 * src/main/java/de/intevation/flys/artifacts/states/State.java: New. The | |
13677 interface description of a state. | |
13678 | |
13679 * src/main/java/de/intevation/flys/artifacts/transitions/Transition.java, | |
13680 src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
13681 New. The interface description and a default implementation of a | |
13682 transition. | |
13683 | |
13684 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java: | |
13685 New. The TransitionEngine stores all transitions for each artifact and | |
13686 should be used to determine, if an artifact can advance from one state to | |
13687 another. | |
13688 | |
13689 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
13690 New. Transitions should be created by using this class. | |
13691 | |
13692 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: New. | |
13693 The Flys context. It currently defines keys to store important components | |
13694 in the context. | |
13695 | |
13696 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13697 New. The context factory initializes the basic components of the | |
13698 application. Currently, the TransitionEngine is created and all artifacts | |
13699 with its transitions are read from the global configuration and stored in | |
13700 the FLYSContext. | |
13701 | |
13702 * pom.xml: Added a dependency to the 'artifacts-common' package. | |
13703 | |
13704 * doc/conf/artifacts/winfo.xml: Corrected the classname of the | |
13705 DefaultTransition. | |
13706 | |
13707 * doc/conf/conf.xml: Added FLYSContextFactory as context-factory. | |
13708 | |
13709 2011-02-02 Ingo Weinzierl <ingo@intevation.de> | |
13710 | |
13711 * doc/conf/conf.xml: An initial configuration file for the FLYS artifact | |
13712 server. | |
13713 | |
13714 * doc/conf/artifacts/winfo.xml: An initial transition configuration of an | |
13715 WINFO artifact. | |
13716 | |
13717 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: A stub of | |
13718 an artifact for a WINFO parameterization. | |
13719 | |
13720 * pom.xml: Set the source code version to 1.5. | |
13721 | |
13722 2011-02-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13723 | |
13724 * src/**, pom.xml: Added initial maven project. | |
13725 * ChangeLog: new. |