Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 2424:092e519ff461
merged flys-artifacts/2.6.1
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Sep 2012 12:14:26 +0200 |
parents | ac528b883b47 |
children | 8490faba00e7 |
comparison
equal
deleted
inserted
replaced
2392:8112ec686a9a | 2424:092e519ff461 |
---|---|
1 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2 | |
3 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): | |
4 Added signature to give w extend for a given km range. | |
5 | |
6 2012-02-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7 | |
8 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): | |
9 Added method to find the w extent for a given km. Useful | |
10 for validating "W auf freier Strecke". | |
11 | |
12 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
13 Removed superfluous import. | |
14 | |
15 2012-02-17 Raimund Renkert <raimund.renkert@intevation.de> | |
16 | |
17 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
18 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
19 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
20 src/main/java/de/intevation/flys/utils/FLYSUtils.java, | |
21 doc/conf/artifacts/winfo.xml: | |
22 Renamed state data fields: wq_mode -> wq_isq | |
23 wq_free -> wq_isfree | |
24 wq_selection -> wq_isrange | |
25 | |
26 2012-02-17 Raimund Renkert <raimund.renkert@intevation.de> | |
27 | |
28 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
29 Write the description instead of the Q value to CSV file. | |
30 | |
31 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
32 Added parameter to overriden method. | |
33 | |
34 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
35 Get Qs without range. | |
36 | |
37 * src/main/resources/messages.properties, | |
38 src/main/resources/messages_de_DE.properties, | |
39 src/main/resources/messages_en.properties, | |
40 src/main/resources/messages_de.properties: | |
41 Adjusted i18n string for CSV metadata. | |
42 | |
43 2012-02-17 Ingo Weinzierl <ingo@intevation.de> | |
44 | |
45 Part II/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) | |
46 | |
47 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
48 Apply legend specific settings (show/hide). | |
49 | |
50 2012-02-17 Ingo Weinzierl <ingo@intevation.de> | |
51 | |
52 Part I/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) | |
53 | |
54 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
55 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved | |
56 adjustPlot() from XYChartGenerator to ChartGenerator which enables the | |
57 TimeseriesChartGenerator to call this method as well. | |
58 | |
59 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
60 Call adjustPlot() in generateChart() to apply the settings specific to | |
61 gridlines in the timeseries plot. | |
62 | |
63 2012-02-16 Raimund Renkert <raimund.renkert@intevation.de> | |
64 | |
65 Refactored the wq data fields. | |
66 | |
67 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
68 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
69 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
70 Changed the wq data fields to boolean values. | |
71 | |
72 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
73 Changed the wq data fields to boolean values and added method that | |
74 returns the km input mode. | |
75 | |
76 2012-02-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
77 | |
78 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
79 Fixed W->Q conversion for "W fuer ungleichwertige Abflusslaengsschnitte." | |
80 | |
81 2012-02-16 Ingo Weinzierl <ingo@intevation.de> | |
82 | |
83 flys/issue509 (Dauerlinie: Q-Achse sollte bei 0 beginnen) | |
84 | |
85 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
86 Set the lower bounds of the Q axis to 0 to avoid displaying negative | |
87 discharge values. | |
88 | |
89 2012-02-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
90 | |
91 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
92 src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
93 (guessWaterIncreasing): Removed from interface. | |
94 | |
95 2012-02-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
96 | |
97 Fix flys/issue150 (exposure of gravitational anomalies) | |
98 | |
99 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
100 src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
101 (guessWaterIncreasing): In analogy to W->WQ->WQKms defined and | |
102 implemented. | |
103 | |
104 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
105 (needInvertAxis): Changed Parameter type to WKms (was WQKms). | |
106 (doW): Use in this case weaker wkms cast to find out whether axis | |
107 has to be inverted. | |
108 | |
109 2012-02-15 Ingo Weinzierl <ingo@intevation.de> | |
110 | |
111 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: Fixed | |
112 SQL statement to fetch hyk formations for rivers with 'km_up' = 0. | |
113 | |
114 2012-02-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
115 | |
116 Another partial fix for flys/issue499: Do the W to Q conversions | |
117 needed for "W am Pegel" correctly. | |
118 | |
119 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
120 Repaired getQsForW(): The mapping from W to Q is not unique! There | |
121 could be more then one Q having the the same W. | |
122 Ws are not strictly monoton/sorted so doing a binary search on this | |
123 is just a fail. We now scan them linearly. | |
124 | |
125 XXX: The whole class is mess. The scaling stuff is a stupid | |
126 and there is no caching. | |
127 | |
128 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
129 Fetch the master discharge table for converting Ws to Qs. Handle | |
130 the case that there are more Qs for a given W. | |
131 | |
132 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java, | |
133 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
134 Adjusted to new semantic. | |
135 | |
136 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
137 | |
138 Partial Fix flys/issue500: text-orientation for texts. | |
139 | |
140 * doc/conf/themes.xml: Change default text orientation for text | |
141 annotations. | |
142 | |
143 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
144 Minor cosmetics. | |
145 | |
146 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
147 Parse and apply text rotation field. | |
148 | |
149 2012-02-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
150 | |
151 Partial fix for flys/issue499 (Wasserspiegellagen: Berechnung für W frei und Pegel kaputt) | |
152 There are still validation issue in the client. | |
153 | |
154 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
155 Fixed state evaluation for "W auf freier Strecke"/"W am Pegel". | |
156 There is still an issue in the client with the input validation | |
157 which prevents entering the right W values for | |
158 "W auf freier Strecke". :-/ | |
159 | |
160 2012-02-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
161 | |
162 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
163 Make it compilable again. | |
164 | |
165 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
166 | |
167 Partial Fix flys/issue500: text-backgrounds for manual points. | |
168 | |
169 * doc/conf/themes.xml: Added text-related style items to manual | |
170 point themes. | |
171 | |
172 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
173 | |
174 Partial Fix flys/issue500 | |
175 | |
176 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
177 Parse whether to show text background. Apply to textannotation. | |
178 | |
179 2012-02-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
180 | |
181 Fix flys/issue490 | |
182 | |
183 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
184 Pass artifact and facet for doAnnotation. | |
185 | |
186 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
187 | |
188 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
189 Use AddScaleFunction instead of LinearFunction. | |
190 | |
191 * src/main/java/de/intevation/flys/artifacts/math/AddScaleFunction.java: | |
192 New. f(x) = m*(x+b). I know its aequivalent to m*x + m*b but it | |
193 makes more clear that the datum [m] (PNP) is substracted before the | |
194 scaling to cm is done. | |
195 | |
196 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
197 | |
198 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Bugfix: take | |
199 care on empty ArtifactAndFacet objects in doAnnotations(). | |
200 | |
201 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
202 | |
203 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: | |
204 Inherits from ReferenceCurveGenerator now which really simplifies it a lot. | |
205 | |
206 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
207 Added to methods to be overwritten by sub classes. | |
208 | |
209 * src/main/resources/messages.properties, | |
210 src/main/resources/messages_de_DE.properties, | |
211 src/main/resources/messages_en.properties, | |
212 src/main/resources/messages_de.properties: Adjusted i8n. | |
213 | |
214 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
215 | |
216 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
217 Indexed access to getInCm. | |
218 | |
219 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
220 Simplified. Do not provide any data to blackboard. Only side effect the | |
221 call context. | |
222 | |
223 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
224 Added convinience method to i18n string with defaulting to key name. | |
225 | |
226 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
227 Label the axis according the scale types of the data. | |
228 TODO: Let the NormalizedReferenceCurveGenerator be a sub class of | |
229 this. | |
230 | |
231 * src/main/resources/messages.properties, | |
232 src/main/resources/messages_de_DE.properties, | |
233 src/main/resources/messages_en.properties, | |
234 src/main/resources/messages_de.properties: i18n for the reference curve axes. | |
235 | |
236 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
237 | |
238 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
239 Fixed wrong double array dimension for PDF exports and write correct | |
240 differences into PDF. | |
241 | |
242 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
243 | |
244 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
245 src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
246 Adjust function to deliver data provider ('blackboard') keys. | |
247 | |
248 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
249 Change the way we exploit the blackboard-mechanism. TODOs added. | |
250 | |
251 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
252 | |
253 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
254 Argh! Finally found the stupid bug in the W~W relation: | |
255 Used iQ1 index on W2(Q2). | |
256 | |
257 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
258 | |
259 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
260 Improved error messsages even more. | |
261 | |
262 * src/main/resources/messages.properties, | |
263 src/main/resources/messages_de_DE.properties, | |
264 src/main/resources/messages_en.properties, | |
265 src/main/resources/messages_de.properties: Adjusted messages. | |
266 | |
267 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
268 | |
269 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
270 Forget to put new created WWAxisType onto blackboard. | |
271 | |
272 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
273 | |
274 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
275 Adjust offset of linear function by same factor as the values. | |
276 | |
277 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
278 | |
279 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Write | |
280 correct min and max values for date axes into the info document. | |
281 | |
282 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
283 Enabled zooming for timeseries charts. | |
284 | |
285 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
286 | |
287 * src/main/java/de/intevation/flys/jfree/Bounds.java, | |
288 src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
289 src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Added a method | |
290 applyBounds(ValueAxis, int) that might be used to adapt the range of the | |
291 axis to the bounds adding a space to the left and right. | |
292 | |
293 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
294 | |
295 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined | |
296 new abstract methods for setting and getting Bounds. Modified and | |
297 renamed getValueAxisRange(). This method is now called | |
298 getValueAxisRangeFromRequest() and returns no longer a Range object but | |
299 a String array that consists of the raw string values speicified in the | |
300 request document. | |
301 | |
302 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
303 Implemented the missing method getDomainAxisRange(). This method returns | |
304 a Range object based on the String array returned from | |
305 getValueAxisRangeFromRequest(). | |
306 | |
307 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
308 | |
309 * src/main/java/de/intevation/flys/jfree/TimeBounds.java: Added new | |
310 methods getLowerAsDate() and getUpperAsDate(). The toString() method | |
311 will now return a string that contains a human readable date string. | |
312 | |
313 * src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Made 'lower' | |
314 always be smaller than 'upper' in the default constructor. | |
315 | |
316 2012-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
317 | |
318 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
319 Give more precise message when an error occurs in W~W relation. | |
320 | |
321 * src/main/resources/messages.properties, | |
322 src/main/resources/messages_de_DE.properties, | |
323 src/main/resources/messages_en.properties, | |
324 src/main/resources/messages_de.properties: | |
325 Improved error messages. | |
326 | |
327 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
328 | |
329 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Modified | |
330 and renamend getDomainAxisRange(). This method is now called | |
331 getDomainAxisRangeFromRequest() and returns no longer a Range object but | |
332 a String array that consists of the raw string values specified in the | |
333 request document. | |
334 | |
335 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
336 Implemented the missing method getDomainAxisRange(). This method returns | |
337 a Range object based on the String array returned from | |
338 getDomainAxisRangeFromRequest(). | |
339 | |
340 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
341 | |
342 * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a | |
343 helper function to determine the min and max bounds (x and y) for | |
344 TimeSeriesCollections. | |
345 | |
346 2012-02-10 Ingo Weinzierl <ingo@intevation.de> | |
347 | |
348 * src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
349 src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Removed | |
350 useless imports. | |
351 | |
352 2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
353 | |
354 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
355 Add accessors to relative heights. | |
356 | |
357 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
358 Add relative heights (to gauge) to csv export. | |
359 | |
360 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
361 | |
362 * pom.xml: Added dependency to GeoTools swing module. | |
363 | |
364 * src/main/java/de/intevation/flys/artifacts/map/PrintMap.java: Standalone | |
365 demo application to print WMS layers to file. | |
366 | |
367 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
368 | |
369 * src/main/java/de/intevation/flys/jfree/TimeBounds.java, | |
370 src/main/java/de/intevation/flys/jfree/DoubleBounds.java, | |
371 src/main/java/de/intevation/flys/jfree/Bounds.java: New model classes that | |
372 should be used for adapting axes ranges later. | |
373 | |
374 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
375 | |
376 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
377 Generate a valid intial i18n name. | |
378 | |
379 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
380 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
381 Pass call context to calculation. | |
382 | |
383 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
384 | |
385 flys/issue485 (Themen können umgenannt werden, dies wird nicht in der Legende reflektiert) | |
386 | |
387 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
388 Use ArtifactAndFacet.setFacetDescription() to set the description for | |
389 themes which are stored in the Collection's XML attribute. | |
390 | |
391 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
392 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
393 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
394 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
395 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
396 src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, | |
397 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
398 src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
399 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
400 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
401 Some refactoring of doXXXOut() methods. We pass the ArtifactAndFacet | |
402 objects of doOut() into those concrete doOut() methods which allows us to | |
403 generate series names for chart curves. | |
404 | |
405 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
406 | |
407 * doc/conf/meta-data.xml: Replaced dashes by underscores in entities | |
408 to ease translation. | |
409 | |
410 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
411 | |
412 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
413 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
414 Fixed problem with including Y-Zeros. | |
415 | |
416 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
417 src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
418 Removed superfluous imports. | |
419 | |
420 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
421 | |
422 Allow points in "new chart"s. | |
423 | |
424 * doc/conf/artifacts/chart.xml: Added manualpoint facets to | |
425 compatibility lists. | |
426 | |
427 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
428 | |
429 * src/main/java/de/intevation/flys/jfree/Style.java: New. A Style object | |
430 needs to implements a method applyTheme() which takes a | |
431 XYLineAndShapeRenderer. | |
432 | |
433 * src/main/java/de/intevation/flys/jfree/XYStyle.java: New. This subclass of | |
434 Style modifies the XYLineAndShapeRenderer specified in applyTheme(). | |
435 | |
436 * src/main/java/de/intevation/flys/jfree/StyledSeries.java: New. This | |
437 interface defines two methods getStyle() and setStyle() to adjust and | |
438 retrieve the Style of a series. | |
439 | |
440 * src/main/java/de/intevation/flys/jfree/StyledTimeSeries.java: New. | |
441 Implementation of StyledSeries that subclasses JFreeChart's TimeSeries. | |
442 | |
443 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Removed the | |
444 code for adapting a XYLineAndShapeRenderer. Instead of implementing this | |
445 stuff in StyledXYSeries itself, this instance now implements StyledSeries | |
446 and stores an instance of XYStyle. | |
447 | |
448 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
449 Create new instances of StyledTimeSeries now which enables styling in this | |
450 chart. | |
451 | |
452 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Enabled | |
453 styling of series for all series that implement StyledSeries. | |
454 | |
455 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
456 | |
457 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
458 Be more conservative about arrays and indices in "Bezugslinienverfahren". | |
459 | |
460 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
461 | |
462 Allow areas in new chart/longitudinal_section. | |
463 | |
464 * doc/conf/artifacts/chart.xml: Added area facet to compatibility | |
465 list. | |
466 | |
467 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
468 | |
469 Fix flys/issue490. Allow CollisionFree..Annotations to collide with | |
470 non-collision-free annotations. | |
471 | |
472 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotationEntity.java: | |
473 New, to take advantage of cheap instanceof operator. | |
474 | |
475 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
476 Only avoid collisions with members of same family (i.e. allow | |
477 collision with annotations of other types). | |
478 | |
479 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
480 | |
481 * doc/conf/themes.xml: Added themes for historical discharge curves and | |
482 the differences to a reference curve. | |
483 | |
484 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
485 | |
486 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Some | |
487 bugfixes and improvements: | |
488 1) take only historical discharge tables into account for calculation | |
489 2) use the correct values for computing differences | |
490 3) moved timerange preparation into an own method | |
491 | |
492 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
493 | |
494 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
495 Fix call to StringUtils.join . | |
496 | |
497 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
498 | |
499 * src/main/resources/messages.properties, | |
500 src/main/resources/messages_de_DE.properties, | |
501 src/main/resources/messages_en.properties, | |
502 src/main/resources/messages_de.properties: | |
503 Added i18n string for waterlevels (from datacage). | |
504 | |
505 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
506 | |
507 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
508 Locale-format multiple double values also. | |
509 | |
510 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
511 | |
512 * doc/conf/artifacts/winfo.xml: Registered a new facet for difference curves | |
513 to the historical discharge output. | |
514 | |
515 * src/main/java/de/intevation/flys/artifacts/model/HistoricalWQTimerange.java: | |
516 New model that is able to store a further double value "diff" besides a W, | |
517 Q and a Timerange. | |
518 | |
519 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Create | |
520 new HistoricalWQTimerange instances with difference between the reference | |
521 discharge table and the historical discharge tables. | |
522 | |
523 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New type | |
524 for historical differences. | |
525 | |
526 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Cast | |
527 Timerange array in getTimeranges(). | |
528 | |
529 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeDifferenceFacet.java: | |
530 New Facet for historical discharge difference curves. | |
531 | |
532 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
533 Create new Facets for the difference curves if the processed data are from | |
534 type HistoricalWQTimerange. | |
535 | |
536 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
537 Added doOut() path for difference curves. | |
538 | |
539 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
540 Increased the size of a double array to be able to get results from | |
541 HistoricalWQTimerange. | |
542 | |
543 * src/main/resources/messages.properties, | |
544 src/main/resources/messages_de_DE.properties, | |
545 src/main/resources/messages_en.properties, | |
546 src/main/resources/messages_de.properties: Added translation for warning | |
547 if no reference discharge table was found for the specified gauge. | |
548 | |
549 2012-02-09 Raimund Renkert <raimund.renkert@intevation.de> | |
550 | |
551 Added PDF export to reference curve calculation. | |
552 | |
553 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
554 Added PDF export. | |
555 | |
556 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
557 doc/conf/artifacts/winfo.xml: | |
558 Add facet for PDF export to state. | |
559 | |
560 * src/main/java/de/intevation/flys/artifacts/model/WWQQJRDataSource.java: | |
561 New. Datasource for JasperReports containing reference curve data. | |
562 | |
563 * src/main/resources/messages.properties, | |
564 src/main/resources/messages_de_DE.properties, | |
565 src/main/resources/messages_en.properties, | |
566 src/main/resources/messages_de.properties: | |
567 Added i18n strings for JasperReports template file and calculation mode. | |
568 | |
569 * doc/conf/jasper/reference.jasper, | |
570 doc/conf/jasper/reference_en.jasper: | |
571 New. Templates for reference curve PDF export. | |
572 | |
573 2012-02-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
574 | |
575 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java(getReferenceEndKms): | |
576 Prevent duplicates in end kms for reference curve calculation. | |
577 | |
578 2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
579 | |
580 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
581 doc/conf/artifacts/winfo.xml: Renamed data item names to allow | |
582 translations. | |
583 | |
584 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
585 | |
586 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
587 Give (Normalized)ReferenceCurveFacets are more appropriate | |
588 description (to be seen in client). | |
589 | |
590 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
591 | |
592 Prepare Reference curves to eat multiple locations as 'Ziel'. | |
593 | |
594 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
595 Cosmetics. | |
596 | |
597 * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: | |
598 New. State to provoke multi_location_panel. | |
599 | |
600 * doc/conf/artifacts/winfo.xml: Made end state of ref curves a (new) | |
601 EnterMultipleLocationState. | |
602 | |
603 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
604 | |
605 flys/issue483 (Historische Abflusstafeln ohne Ergebnis) | |
606 | |
607 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add | |
608 a problem for the calculation report if no discharge tables were found | |
609 for the given timerange. | |
610 | |
611 * src/main/resources/messages.properties, | |
612 src/main/resources/messages_de_DE.properties, | |
613 src/main/resources/messages_en.properties, | |
614 src/main/resources/messages_de.properties: Added translation for error | |
615 messages created by Calculation6. | |
616 | |
617 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
618 | |
619 * src/main/java/de/intevation/flys/utils/Formatter.java: | |
620 Format kms in error reports at least with one digit after | |
621 the decimal separator. | |
622 | |
623 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
624 | |
625 Fix flys/issue468 (Fehler beim Projekt-Duplizieren) | |
626 | |
627 * src/main/java/de/intevation/flys/exports/ReportGenerator.java: | |
628 Always create a new XML document when calling report generation. | |
629 XXX: There is a bug somewhere which calls error reporting twice | |
630 when cloning a collection. Speculation: It has something to do with | |
631 the settings stuff. | |
632 | |
633 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
634 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
635 Remove superfluous imports. | |
636 | |
637 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: | |
638 Added missing Override annotation. | |
639 | |
640 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
641 | |
642 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
643 Handle Manual Point Facets, added TODO. | |
644 | |
645 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
646 | |
647 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
648 Subclass BlackboardDataFacet to repair areas over cross sections. | |
649 | |
650 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
651 | |
652 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Let text | |
653 and line annotations placed at x or y axes always be in foreground. | |
654 | |
655 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
656 | |
657 Fix flys/issue474 (manual points in reference curves). | |
658 | |
659 * doc/conf/artifacts/winfo.xml, | |
660 doc/conf/artifacts/manualpoints.xml: | |
661 Add manualpoints to lists just so that really everybody knows. | |
662 | |
663 * doc/conf/themes.xml: Add styles for manual points in ref curves. | |
664 | |
665 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
666 Add ref curve chart types. | |
667 | |
668 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
669 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
670 Handle manual point facets. | |
671 | |
672 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
673 | |
674 Partial Fix flys/issue474. | |
675 | |
676 * src/main/resources/messages.properties, | |
677 src/main/resources/messages_de_DE.properties, | |
678 src/main/resources/messages_en.properties, | |
679 src/main/resources/messages_de.properties: Added translation for | |
680 normalized_reference_curve. | |
681 | |
682 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
683 | |
684 Fix flys/issue475. | |
685 | |
686 * doc/conf/themes.xml: Register theme for reference_curve_normalized. | |
687 | |
688 2012-02-08 Ingo Weinzierl <ingo@intevation.de> | |
689 | |
690 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Add a "/" to the | |
691 URL of the user wms if the URL configured in conf.xml doesn't end with | |
692 a "/". | |
693 | |
694 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
695 | |
696 Fix flys/issue472. | |
697 | |
698 * doc/conf/themes.xml: Added theme for discharge_curve manualpoints. | |
699 | |
700 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
701 Added discharge_curve as chart type. | |
702 | |
703 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
704 | |
705 Fix flys/issue484 ((i18n: Ungleichwertige... Report)) | |
706 | |
707 * src/main/resources/messages.properties, | |
708 src/main/resources/messages_de_DE.properties, | |
709 src/main/resources/messages_en.properties, | |
710 src/main/resources/messages_de.properties: Fixed key spelling. | |
711 | |
712 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
713 | |
714 Fix flys/issue478 (Manuelle Punkte: Stil nicht änderbar). | |
715 | |
716 * doc/conf/themes: Map correct theme to manualpoint themes. | |
717 | |
718 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
719 | |
720 Partial fix flys/issue472 . | |
721 | |
722 * doc/conf/artifacts/winfo.xml: Add manual points to compatibility | |
723 list of cross_sections. | |
724 | |
725 * doc/conf/artifacts/manualpoints.xml: Add manualpoints to list of | |
726 generated facets. | |
727 | |
728 2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
729 | |
730 * doc/conf/themes.xml: Commented styling option for show area until | |
731 area calculation works. | |
732 | |
733 2012-02-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
734 | |
735 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
736 i18n the km of the error report. | |
737 | |
738 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
739 Fixed potential race conditions. | |
740 | |
741 * src/main/java/de/intevation/flys/utils/Formatter.java: Added | |
742 formatter for error report kms. | |
743 | |
744 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
745 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
746 Removed superfluous imports. | |
747 | |
748 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
749 Commented out some imports. They are used be out commented code. | |
750 | |
751 2012-02-07 Ingo Weinzierl <ingo@intevation.de> | |
752 | |
753 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
754 Use the correct km key for an unspecific km for fetching the whole river | |
755 annotations. | |
756 | |
757 2012-02-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
758 | |
759 * doc/conf/conf.xml: Added missing config of chart info generator | |
760 of normalized reference curve. | |
761 | |
762 2012-02-07 Ingo Weinzierl <ingo@intevation.de> | |
763 | |
764 * doc/conf/conf.xml: Fixed wrong chart info generator name for historical | |
765 discharge curves. | |
766 | |
767 2012-02-07 Raimund Renkert <raimund.renkert@intevation.de> | |
768 | |
769 Added PDF export for historical discharge curve calculations. | |
770 | |
771 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
772 Implemented PDF export for calculation results. | |
773 | |
774 * src/main/java/de/intevation/flys/artifacts/model/WQTJRDataSource.java: | |
775 New. Datasource for JasperReports. | |
776 | |
777 * doc/conf/artifacts/winfo.xml: | |
778 Added facet for PDF export to historical discharge curve output mode. | |
779 | |
780 * src/main/resources/messages.properties, | |
781 src/main/resources/messages_de_DE.properties, | |
782 src/main/resources/messages_en.properties, | |
783 src/main/resources/messages_de.properties: | |
784 Added i18n strings for historical discharge curve export. | |
785 | |
786 * doc/conf/jasper/historical-discharge.jasper, | |
787 doc/conf/jasper/historical-discharge_en.jasper: | |
788 New. Templates for JasperReports PDF creation. | |
789 | |
790 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
791 | |
792 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
793 Handle WWQQs, extended CSV export of reference curves. | |
794 | |
795 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
796 | |
797 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
798 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
799 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
800 Recactored, moved Formatter accessors to base class AbstractExporter. | |
801 | |
802 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
803 | |
804 Let reference curve calculation result in specific WWQQ, extended CSV | |
805 | |
806 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java | |
807 (getWW,getWWQQ): Renamed and changed result type. | |
808 | |
809 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java, | |
810 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
811 Result in WWQQs, not in WWs. | |
812 | |
813 2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
814 | |
815 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
816 Log error as warning. | |
817 | |
818 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
819 | |
820 * src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java: | |
821 New. Linear function f(x) = m*x + b. | |
822 | |
823 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
824 Do the normalizing. Cascading functions is not required. | |
825 | |
826 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
827 | |
828 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveInfoGenerator.java: | |
829 Added missing chart info generator for the normalized reference curves. | |
830 | |
831 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
832 | |
833 * src/main/resources/messages_de_DE.properties, | |
834 src/main/resources/messages_de.properties: Fix i18n. | |
835 | |
836 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
837 | |
838 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
839 Added optional boolean flag to indicated if the data should be 'normalized'. | |
840 TODO: Build the cascading normalising function call chain. | |
841 | |
842 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, | |
843 src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
844 Fetch WWAxisTypes from call context to do the right scaling. | |
845 | |
846 2012-02-06 Raimund Renkert <raimund.renkert@intevation.de> | |
847 | |
848 Added service for discharge infos at a specific gauge. | |
849 | |
850 * doc/conf/conf.xml: Added service factory entry. | |
851 | |
852 * src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java: | |
853 New. Returns description, start year and end year of discharges at a | |
854 specific gauge. | |
855 | |
856 * src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: | |
857 Return a more specific ui provider string. | |
858 | |
859 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
860 | |
861 * doc/conf/conf.xml: Registered generator for normalized reference curves. | |
862 | |
863 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
864 Added "reference_curve_normalized". | |
865 | |
866 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
867 Added facets for normalized reference curves. | |
868 | |
869 * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: | |
870 Generator for normalized reference curves. | |
871 | |
872 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
873 | |
874 * doc/conf/artifacts/winfo.xml: Added config for "reduzierte Bezugslinie". | |
875 | |
876 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
877 | |
878 * doc/conf/artifacts/winfo.xml: Added error report. | |
879 | |
880 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
881 | |
882 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Set | |
883 proper bounds for date axis elements; tell the transformation matrix which | |
884 type it is (number/date). | |
885 | |
886 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
887 | |
888 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
889 Include location description string in csv output of referencecurve- | |
890 exporter. | |
891 | |
892 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
893 | |
894 * src/main/java/de/intevation/flys/artifacts/model/WW.java: Added constructor call. | |
895 * src/main/java/de/intevation/flys/artifacts/model/WWQQ.java: New. | |
896 Stores the Qs for the Ws, too. | |
897 | |
898 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: Create | |
899 WWQQs instead of WWs. | |
900 | |
901 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
902 | |
903 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
904 Added further i18n stubs and slightly more data. | |
905 | |
906 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
907 | |
908 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
909 Return the Qs of the Ws, too. | |
910 | |
911 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
912 Adjusted to cope with the return Qs. TODO: Create WQWQ or WWQQ dataset | |
913 for storing the result. | |
914 | |
915 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
916 | |
917 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
918 Added further i18n stubs. | |
919 Also added a second Y axis (experimental, to ease axis labeling etc.). | |
920 | |
921 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
922 | |
923 * doc/conf/artifacts/winfo.xml: Register new export output and csv | |
924 facet for reference curves. | |
925 | |
926 * doc/conf/conf.xml: Register Exporter for reference curve. | |
927 | |
928 * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: | |
929 Primitive exporter, bland copy of another one. | |
930 | |
931 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
932 | |
933 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
934 Enabled some i18n of labels. | |
935 | |
936 * src/main/resources/messages.properties, | |
937 src/main/resources/messages_de_DE.properties, | |
938 src/main/resources/messages_en.properties, | |
939 src/main/resources/messages_de.properties: Basic i18n for reference | |
940 curves added. | |
941 | |
942 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
943 | |
944 * doc/conf/conf.xml: Registered the HistoricalDischargeCurveInfoGenerator. | |
945 | |
946 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveInfoGenerator.java: | |
947 New. This info generator returns information of a | |
948 HistoricalDischargeCurveGenerator. | |
949 | |
950 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Add an | |
951 attribute "axistype" to axes nodex based on the JFreeChart Axis type. | |
952 Number axes get a "number", date axes a "date". | |
953 | |
954 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined an | |
955 abstract method getRangesForAxis(). | |
956 | |
957 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Awaits | |
958 now an instance of ChartGenerator instead of XYChartGenerator. | |
959 | |
960 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
961 Implemented the getRangesForAxis() method (copied from XYChartGenerator). | |
962 | |
963 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
964 @Override annotation to getRangesForAxis(). | |
965 | |
966 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
967 | |
968 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
969 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
970 Cosmetics. | |
971 | |
972 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
973 | |
974 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
975 Add CSV facet (not yet evaluated). | |
976 | |
977 2012-02-06 Ingo Weinzierl <ingo@intevation.de> | |
978 | |
979 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: | |
980 New. This OutGenerator exports historical discharge curves to CSV and PDF. | |
981 Currently, only the CSV export is implemented! | |
982 | |
983 * doc/conf/artifacts/winfo.xml: Registered a new Output CSV for historical | |
984 discharge curves. | |
985 | |
986 * doc/conf/conf.xml: Registered the HistoricalDischargeCurveExporter. | |
987 | |
988 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
989 Generate new Facets for CSV and PDF output. | |
990 | |
991 * src/main/java/de/intevation/flys/utils/Formatter.java: Added new functions | |
992 that return number formatters for historical discharge curves and a date | |
993 formatter for short dates. | |
994 | |
995 * src/main/resources/messages.properties, | |
996 src/main/resources/messages_de_DE.properties, | |
997 src/main/resources/messages_en.properties, | |
998 src/main/resources/messages_de.properties: Added strings for CSV header of | |
999 historical discharge curve export. | |
1000 | |
1001 2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1002 | |
1003 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1004 Adjusted to name change in River ('hibernate fix'). | |
1005 | |
1006 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1007 | |
1008 * doc/conf/artifacts/winfo.xml: Adapted the data type of W/Q input values | |
1009 for historical discharge curve calculation (intarray -> doublearray). | |
1010 | |
1011 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: | |
1012 Adapted the data type of W/Q input values. | |
1013 | |
1014 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1015 | |
1016 First steps to serve the data in cm if we are are gauges only. | |
1017 | |
1018 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1019 Fetch map gauge station -> gauge datum from backend for reference curve. | |
1020 | |
1021 * src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java: | |
1022 New. Linear transforms another function. | |
1023 | |
1024 * src/main/java/de/intevation/flys/artifacts/math/FilterFunction.java: | |
1025 New. Allows cascading functions. | |
1026 | |
1027 * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: | |
1028 New. Classifier what kind of axis types are needed. | |
1029 | |
1030 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
1031 Removed. Is now obsolete. | |
1032 | |
1033 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1034 Stores gauge station kms for start and end km if they are any. | |
1035 | |
1036 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1037 Should generate a WWAxisTypes classifier via side effect to the | |
1038 call context. | |
1039 | |
1040 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1041 Figure out for each start/end km if its a gauge station and store this | |
1042 information in the result WWs. | |
1043 | |
1044 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1045 Uses the WWAxisTypes classifier now to generate the right data. | |
1046 TODO: Use the blackboard object. | |
1047 | |
1048 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1049 | |
1050 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
1051 Removed superfluous imports. | |
1052 | |
1053 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1054 | |
1055 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1056 Set number of interpolation steps for relation curve to 200. | |
1057 | |
1058 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1059 Do not sort the XYSeries. | |
1060 | |
1061 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1062 | |
1063 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: | |
1064 Removed. Was stub. | |
1065 | |
1066 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1067 | |
1068 Improved Reference Curves. | |
1069 | |
1070 * doc/conf/artifacts/winfo.xml: Add start/end input step for reference | |
1071 curves. | |
1072 | |
1073 * doc/conf/themes.xml: Add theme for reference curve. | |
1074 | |
1075 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1076 Disable start/end point-hack for reference curve. Go with 'live' | |
1077 values. | |
1078 | |
1079 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1080 i18n. | |
1081 | |
1082 * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: | |
1083 New. State to enter location. | |
1084 | |
1085 * src/main/java/de/intevation/flys/artifacts/states/InputDoubleState.java: | |
1086 New. | |
1087 | |
1088 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1089 Take WW name to display in themepanel. | |
1090 | |
1091 * src/main/resources/messages.properties, | |
1092 src/main/resources/messages_de_DE.properties, | |
1093 src/main/resources/messages_en.properties, | |
1094 src/main/resources/messages_de.properties: Added translations. | |
1095 | |
1096 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1097 | |
1098 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Use | |
1099 the current date for discharge tables which doesn't have a stop time set. | |
1100 A warning message is written to log. | |
1101 | |
1102 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1103 Generate report facet before leaving the computeXXX() method when no | |
1104 calculation results has been computed. | |
1105 | |
1106 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1107 | |
1108 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
1109 that returns the name of a reference gauge (for historical discharge | |
1110 curves). | |
1111 | |
1112 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1113 Create title, subtitle and axes labels for charts of this type. | |
1114 | |
1115 * src/main/resources/messages.properties, | |
1116 src/main/resources/messages_de_DE.properties, | |
1117 src/main/resources/messages_en.properties, | |
1118 src/main/resources/messages_de.properties: Added title, subtitle and axes | |
1119 labels for historical discharge curves. | |
1120 | |
1121 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1122 | |
1123 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1124 Fix. | |
1125 | |
1126 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1127 | |
1128 * src/main/resources/messages.properties, | |
1129 src/main/resources/messages_de_DE.properties, | |
1130 src/main/resources/messages_en.properties, | |
1131 src/main/resources/messages_de.properties: Added translations for | |
1132 states (will be shown in client). | |
1133 | |
1134 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1135 | |
1136 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1137 Ja!vadoc. | |
1138 | |
1139 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1140 Declare getYAxisWalker as abstract to avoid weird issue with | |
1141 overriden methods of this name. | |
1142 | |
1143 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1144 | |
1145 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: | |
1146 Use the WW.ApplyFunctionIterator to fetch the data. | |
1147 | |
1148 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
1149 Removed superfluous imports. | |
1150 | |
1151 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1152 | |
1153 * doc/conf/artifacts/winfo.xml: Registered a ReportFacet for historical | |
1154 discharge curve report. | |
1155 | |
1156 * doc/conf/conf.xml: Registered a ReportGenerator for historical discharge | |
1157 curves. | |
1158 | |
1159 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add | |
1160 problems if we were not able to find a Q for a given W. | |
1161 | |
1162 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1163 Generate a ReportFacet if there were problems during calculcation. | |
1164 | |
1165 * src/main/resources/messages.properties, | |
1166 src/main/resources/messages_de_DE.properties, | |
1167 src/main/resources/messages_en.properties, | |
1168 src/main/resources/messages_de.properties: Added error messages for the | |
1169 case that we were not able to find a Q for a given W while calculating | |
1170 historical discharge curve data. | |
1171 | |
1172 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1173 | |
1174 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1175 Improved adding new data for historical discharge curves: skip NaN | |
1176 values; use JFreeChart's Day TimePeriod instead of Second. | |
1177 | |
1178 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1179 | |
1180 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1181 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Refactoring: | |
1182 moved addDatasets(), applyThemes() and some other methods into | |
1183 ChartGenerator; enhanced the AxisDataset interface. | |
1184 | |
1185 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1186 Implemented necessary abstract methods and improved internal AxisDataset | |
1187 class (added new methods). | |
1188 | |
1189 2012-02-03 Ingo Weinzierl <ingo@intevation.de> | |
1190 | |
1191 * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a | |
1192 function that expands a given range. Take care on NaN in getRanges(). | |
1193 | |
1194 * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
1195 Prevent of NullPointerExceptions in isMinimumShapeVisible() and | |
1196 isMaximumShapeVisible(). | |
1197 | |
1198 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1199 | |
1200 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1201 Create new AxisDatasets and new TimeSeriesCollections for each Facet. | |
1202 | |
1203 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1204 | |
1205 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Added a | |
1206 method getTimerange(idx) that returns the Timerange at a given index. | |
1207 | |
1208 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: | |
1209 Return the correct WQTimerange object in getData(). | |
1210 | |
1211 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1212 | |
1213 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1214 src/main/java/de/intevation/flys/exports/ChartGenerator.java: More | |
1215 refactoring: the AxisDataset is defined by an interface in ChartGenerator | |
1216 now. Each subclass of ChartGenerator should implement its own AxisDataset. | |
1217 This allows us to provide multiple XYDataset types in different charts. | |
1218 | |
1219 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1220 Implemented some necessary methods (abstract definitions of parent class) | |
1221 and create new empty timeseries charts. | |
1222 | |
1223 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1224 | |
1225 * src/main/java/de/intevation/flys/exports/ChartHelper.java: New helper | |
1226 class for working with charts. | |
1227 | |
1228 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1229 | |
1230 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1231 Removed useless import. | |
1232 | |
1233 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1234 src/main/java/de/intevation/flys/exports/ChartGenerator.java: More | |
1235 refactoring: moved more base code from XYChartGenerator to its parent | |
1236 class ChartGenerator. | |
1237 | |
1238 2012-02-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1239 | |
1240 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
1241 Refactored. Use supers static field. | |
1242 | |
1243 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
1244 Refactored. Use static field. | |
1245 | |
1246 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
1247 src/main/java/de/intevation/flys/utils/FLYSUtils.java | |
1248 (getMinMax, getRiverMinMax): Refactored. Moved to FLYSUtils. | |
1249 | |
1250 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1251 Add so-called javadoc. | |
1252 | |
1253 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1254 | |
1255 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1256 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved | |
1257 further base code from XYChartGenerator into its ChartGenerator. | |
1258 | |
1259 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1260 Override generateChart() instead of generate() which is now implemented | |
1261 in ChartGenerator. | |
1262 | |
1263 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1264 | |
1265 * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: | |
1266 New. This ChartGenerator should be used for timeseries charts. Currently, | |
1267 this class is a stub only! WORK IS IN PROGRESS! | |
1268 | |
1269 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1270 Subclasses TimeseriesChartGenerator now instead of XYChartGenerator, | |
1271 because historical discharge curve charts will have a time x axis set. | |
1272 | |
1273 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1274 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved some | |
1275 basic stuff from XYChartGenerator into ChartGenerator. | |
1276 | |
1277 2012-02-02 Ingo Weinzierl <ingo@intevation.de> | |
1278 | |
1279 * src/main/java/de/intevation/flys/artifacts/charts/TimeseriesStepChart.java: | |
1280 Added standalone demo app for evaluating different timeseries charts. | |
1281 | |
1282 2012-02-02 Raimund Renkert <raimund.renkert@intevation.de> | |
1283 | |
1284 Issue 466: CSV export for chart themes. | |
1285 | |
1286 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1287 Export a CSV file if the requested format is 'csv'. | |
1288 | |
1289 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
1290 Generate the CSV file containing X-Y-data of all activated themes. | |
1291 | |
1292 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1293 | |
1294 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
1295 Moved code to load values of a discharge table into an own static | |
1296 function to be able to reuse it in Calculation6. | |
1297 | |
1298 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: | |
1299 Implemented the findValueForW(). | |
1300 | |
1301 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1302 | |
1303 Fake some reference curve input values to have working prototype | |
1304 to work on. | |
1305 | |
1306 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1307 Syntax-stunt fake reference inputs. | |
1308 | |
1309 * src/main/java/de/intevation/flys/artifacts/model/WW.java | |
1310 (getW1): Accessor for first w at index (for the raw ww). | |
1311 | |
1312 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java | |
1313 (doReferenceOut): Plot the raw W-over-W. | |
1314 | |
1315 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1316 | |
1317 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Create time | |
1318 millis for timerange used in Calculation6. | |
1319 | |
1320 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Added | |
1321 the first step of the calculation: fetch relevant discharge tables based | |
1322 on the given input parameters. The calculated values are not the right | |
1323 ones! Finding Ws and Qs in discharge tables is still not implemented! WORK | |
1324 IN PROGRESS! | |
1325 | |
1326 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
1327 Create facets for each WQTimerange object calculated by Calculation6. | |
1328 | |
1329 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1330 | |
1331 * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: Added a | |
1332 new constructor that takes Date objects for start and end time. | |
1333 | |
1334 2012-02-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1335 | |
1336 * src/main/java/de/intevation/flys/artifacts/model/W.java: | |
1337 Forget to create ws data in constructor. | |
1338 | |
1339 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1340 | |
1341 * doc/conf/artifacts/winfo.xml: Replaced Reference Curve input state | |
1342 with LocationSelect-State for debugging purposes. Add output to | |
1343 reference.curve- state. | |
1344 | |
1345 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1346 | |
1347 * doc/conf/conf.xml: Register ReferenceCurve*Generators. | |
1348 | |
1349 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1350 | |
1351 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
1352 Cosmetics. | |
1353 | |
1354 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1355 | |
1356 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1357 Added pro forma facet. | |
1358 | |
1359 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1360 | |
1361 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1362 Added comment. | |
1363 | |
1364 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1365 | |
1366 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1367 Added reference curve facet type. | |
1368 | |
1369 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1370 | |
1371 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Fetch | |
1372 necessary parameters for 'historical discharge curve' calculation and call | |
1373 Calculation6 with those parameters. | |
1374 | |
1375 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: | |
1376 Modified default constructor and calculate() signatures and added a | |
1377 parameter check which is evaluated before the calculation starts. | |
1378 | |
1379 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1380 | |
1381 * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java, | |
1382 src/main/java/de/intevation/flys/exports/ReferenceCurveInfoGenerator.java: | |
1383 Added outline of a new chart-generator. | |
1384 | |
1385 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1386 | |
1387 * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: New. | |
1388 This class might be used to store timeranges. Start and end time are | |
1389 stores as long (milliseconds since january 1, 1970). | |
1390 | |
1391 * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: | |
1392 New. This class should be used to save Ws, Qs and timeranges. | |
1393 | |
1394 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1395 | |
1396 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added helper | |
1397 methods to extract int[] and double[] from string. | |
1398 | |
1399 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1400 | |
1401 * doc/conf/artifacts/winfo.xml: Registered new facet type | |
1402 'historical_discharge.historicalq' to the 'historical_discharge' output. | |
1403 | |
1404 * doc/conf/conf.xml: Registered new HistoricalDischargeCurveGenerator for | |
1405 output type 'historical_discharge'. | |
1406 | |
1407 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
1408 new facet type for HISTORICAL_DISCHARGE_Q. | |
1409 | |
1410 * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: | |
1411 New. This ChartGenerator is used to generate new charts for historical | |
1412 discharge curves. WORK IN PROGRESS! | |
1413 | |
1414 * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: New. | |
1415 This class should 'compute' the historical discharge curves. WORK IN | |
1416 PROGRESS! | |
1417 | |
1418 * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: | |
1419 New. This Facet is used during the calculation of historical discharge | |
1420 curves. | |
1421 | |
1422 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, | |
1423 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added stubs | |
1424 to trigger the calculation of data used for generating historical | |
1425 discharge curve charts. | |
1426 | |
1427 2012-02-01 Ingo Weinzierl <ingo@intevation.de> | |
1428 | |
1429 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1430 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
1431 Removed needless imports. | |
1432 | |
1433 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1434 | |
1435 * src/main/resources/messages_de.properties, | |
1436 src/main/resources/messages_de_DE.properties: | |
1437 Fixed "W bei ..m" -> "W fuer ...n" . | |
1438 | |
1439 2012-02-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1440 | |
1441 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1442 Avoid NPE, add warning to log to not forget about it. | |
1443 | |
1444 2012-01-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1445 | |
1446 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
1447 Fixed problems with unformatted numbers in error message. | |
1448 | |
1449 2012-01-31 Ingo Weinzierl <ingo@intevation.de> | |
1450 | |
1451 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: | |
1452 Override getLabelFor() to return the I18N string for the selected | |
1453 evaluation mode. | |
1454 | |
1455 2012-01-31 Ingo Weinzierl <ingo@intevation.de> | |
1456 | |
1457 * doc/conf/artifacts/winfo.xml: Modified types of parameters in the | |
1458 'historical discharge curves' transitions. | |
1459 | |
1460 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1461 | |
1462 * doc/conf/artifacts/winfo.xml: Fix transition type (Stupid Bug 1.0 reverse). | |
1463 | |
1464 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1465 | |
1466 * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java: | |
1467 Override getLabelFor() method defined in DefaultState to return the name | |
1468 of a Gauge based on the official number which is stored in the | |
1469 parameterization. | |
1470 | |
1471 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1472 | |
1473 Allow manual points in more diagram types. | |
1474 | |
1475 * doc/conf/artifacts/winfo.xml: Add respective facet types to | |
1476 compatibility lists of output modes. | |
1477 | |
1478 * doc/conf/artifacts/manualpoints.xml: Mention facet types. | |
1479 | |
1480 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1481 Added ChartType enum to ease later iteration. | |
1482 (IS.MANUALPOINTS): Added helper. | |
1483 | |
1484 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java: | |
1485 Help artifact figuring out which data to provide by passing facet | |
1486 name. | |
1487 | |
1488 * src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
1489 Respond to getPointData with correct data item, depending on facet | |
1490 name. | |
1491 | |
1492 * src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: | |
1493 Iterate over chart types. Add facets if corresponding data is found. | |
1494 | |
1495 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1496 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
1497 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1498 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
1499 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
1500 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
1501 Handle manual point facets. | |
1502 | |
1503 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1504 | |
1505 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Clone | |
1506 StateData model objects to save parameters in this Artifact - create | |
1507 new StateData instances only if no StateData model was found for a | |
1508 parameter. This solves the problem of loosing the type of a StateData. | |
1509 | |
1510 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
1511 Implemented a getLabelFor() method that is used to format a parameter | |
1512 value. | |
1513 | |
1514 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
1515 Adapted method signature of transform(). | |
1516 | |
1517 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1518 Override getLabelFor() method to create a well formatted label for min/max | |
1519 values. | |
1520 | |
1521 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1522 | |
1523 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: | |
1524 Bugfix: use correct order of parameters in DefaultStateData constructor. | |
1525 | |
1526 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1527 | |
1528 * doc/conf/artifacts/winfo.xml: Fixed a stupid bug. Use | |
1529 ValueCompareTransition instead of DefaultTransition to evaluate values. | |
1530 | |
1531 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1532 | |
1533 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: | |
1534 Write default values for min and max items into the DESCRIBE document. | |
1535 | |
1536 2012-01-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1537 | |
1538 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1539 Added field 'startKm' and 'endKm' to make it easier to associate | |
1540 gauge to km to return Ws in cm if km is at a gauge. | |
1541 | |
1542 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1543 Construct the WWs with startKm and endKm. This is necessary because | |
1544 if an error occurs in calcuting an in between km in a list of end kms | |
1545 the index does not correspond to the input value any more. | |
1546 | |
1547 2012-01-30 Ingo Weinzierl <ingo@intevation.de> | |
1548 | |
1549 * doc/conf/artifacts/winfo.xml: Added transitions for "historical discharge | |
1550 curves" calculation. | |
1551 | |
1552 2012-01-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1553 | |
1554 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1555 (doPoints): Skip 'inactive' points. | |
1556 | |
1557 2012-01-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1558 | |
1559 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1560 Removed the createNormalized() method because it did not | |
1561 solve all problems with the transformation of the W~W data we have. | |
1562 | |
1563 - We need to shift the values to be based in (0, 0). | |
1564 - We need to linear transform the values if they are at gauges. | |
1565 - Copying the data is memory expensive. | |
1566 | |
1567 Therefore there is now a new inner class ApplyFunctionIterator | |
1568 that is able to transform the values in an iterator like manner. | |
1569 The transform functions default to the identity. | |
1570 | |
1571 * src/main/java/de/intevation/flys/artifacts/math/Sub.java: New. | |
1572 Simple function that subtract a scalar from the parameter. | |
1573 | |
1574 * src/main/java/de/intevation/flys/artifacts/model/W.java: Added | |
1575 method minWs() to calulate the minimal W of the data. | |
1576 | |
1577 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
1578 getData() returns a WW.ApplyFunctionIterator with identity transform. | |
1579 | |
1580 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1581 getData() returns a WW.ApplyFunctionIterator with a base shift to (0, 0). | |
1582 | |
1583 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1584 | |
1585 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1586 Added method createNormalized() to shift the data to start in (0, 0). | |
1587 | |
1588 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
1589 Returns the 'normalized' data of the reference curve. | |
1590 | |
1591 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1592 | |
1593 * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: | |
1594 New. Facet for the normalized W~W relation. | |
1595 TODO: Implement the on-the-fly creation logic. | |
1596 | |
1597 * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: | |
1598 New. Facet for the W~W relation. | |
1599 | |
1600 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: Cosmetics. | |
1601 | |
1602 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1603 | |
1604 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: | |
1605 Added stub loop for creating facets. | |
1606 | |
1607 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
1608 Cosmetics. | |
1609 | |
1610 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1611 | |
1612 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1613 Call the 'Bezugslinienverfahren'. | |
1614 | |
1615 * src/main/resources/messages.properties, | |
1616 src/main/resources/messages_de_DE.properties, | |
1617 src/main/resources/messages_en.properties, | |
1618 src/main/resources/messages_de.properties: | |
1619 I18N for the 'Bezugslinienverfahren' error messages. | |
1620 | |
1621 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1622 | |
1623 * doc/conf/themes.xml: Better theme for manual points. | |
1624 | |
1625 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1626 Theme text part of manual points. Offset it a bit. | |
1627 | |
1628 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1629 | |
1630 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1631 Fixed stupid bug. | |
1632 | |
1633 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
1634 | |
1635 * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java, | |
1636 src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, | |
1637 src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java, | |
1638 src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: | |
1639 New. States used in the 'historical discharge curve' calculation. | |
1640 | |
1641 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
1642 | |
1643 * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: New | |
1644 state that eases adding min/max value pairs to describe document. | |
1645 | |
1646 * src/main/java/de/intevation/flys/artifacts/states/IntRangeState.java: | |
1647 New. Subclasses MinMaxState and allows adding min/max integer value pairs. | |
1648 | |
1649 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
1650 | |
1651 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Moved | |
1652 code to add items to a data node for dynamich UI into an own method. | |
1653 | |
1654 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
1655 | |
1656 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: Removed | |
1657 useless import. | |
1658 | |
1659 2012-01-27 Ingo Weinzierl <ingo@intevation.de> | |
1660 | |
1661 * src/main/resources/messages.properties, | |
1662 src/main/resources/messages_de_DE.properties, | |
1663 src/main/resources/messages_en.properties, | |
1664 src/main/resources/messages_de.properties: Added strings which are used n | |
1665 the calculation "historical discharge curve". | |
1666 | |
1667 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1668 | |
1669 * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: | |
1670 New. Calcutation to be created from WINFOArtifact | |
1671 for the 'Bezugslinienverfahren'. | |
1672 | |
1673 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1674 Added TODO about optimization of the 'Bezugslinienverfahren'. | |
1675 Added number of default samples of the W~W relation. | |
1676 | |
1677 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1678 Added convinience constructor to store the calculation results. | |
1679 | |
1680 * ChangeLog: Removed false TODO. | |
1681 | |
1682 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
1683 | |
1684 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
1685 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
1686 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
1687 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
1688 Read jasper template file from resources to support i18n reports. | |
1689 | |
1690 * doc/conf/jasper/wdifferences.jasper, | |
1691 doc/conf/jasper/duration.jasper, | |
1692 doc/conf/jasper/computed-discharge.jasper, | |
1693 doc/conf/jasper/waterlevel.jasper: | |
1694 Updated report template. Resized left margin. | |
1695 | |
1696 * doc/conf/jasper/computed-discharge_en.jasper, | |
1697 doc/conf/jasper/duration_en.jasper, | |
1698 doc/conf/jasper/wdifferences_en.jasper, | |
1699 doc/conf/jasper/waterlevel_en.jasper: | |
1700 New. Templates for english reports. | |
1701 | |
1702 * src/main/resources/messages.properties, | |
1703 src/main/resources/messages_de_DE.properties, | |
1704 src/main/resources/messages_en.properties, | |
1705 src/main/resources/messages_de.properties: | |
1706 Added i18n strings for template files and modes. | |
1707 | |
1708 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1709 | |
1710 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1711 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1712 Prevent second Legend Entry for points (prior was one for the | |
1713 TextAnnotations and one for the points). | |
1714 | |
1715 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1716 | |
1717 Blindly render Text of manual points if it does not collide with | |
1718 other text. | |
1719 | |
1720 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1721 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1722 Handle TextAnnotations, create some for manual points. | |
1723 | |
1724 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
1725 Added setter for TextAnnotations, documentation. | |
1726 | |
1727 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1728 | |
1729 * src/main/resources/messages.properties, | |
1730 src/main/resources/messages_de_DE.properties, | |
1731 | |
1732 2012-01-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1733 | |
1734 Refactored class hierachy to integrate model for W~W: | |
1735 | |
1736 NamedObjImpl | |
1737 \-- W | |
1738 +-- WW | |
1739 \-- WQ | |
1740 +-- WQDay | |
1741 \-- WQKms | |
1742 \-- WQCKms | |
1743 | |
1744 * src/main/java/de/intevation/flys/artifacts/model/W.java: | |
1745 New. Base class | |
1746 | |
1747 * src/main/java/de/intevation/flys/artifacts/model/WW.java: | |
1748 New. Model for W~W | |
1749 | |
1750 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
1751 src/main/java/de/intevation/flys/artifacts/model/WQDay.java, | |
1752 src/main/java/de/intevation/flys/artifacts/model/WQ.java, | |
1753 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
1754 Adjusted to follow the new class hierarchy. | |
1755 | |
1756 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
1757 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
1758 Removed superfluous imports. | |
1759 | |
1760 2012-01-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1761 | |
1762 * src/main/resources/messages.properties, | |
1763 src/main/resources/messages_de_DE.properties, | |
1764 src/main/resources/messages_en.properties, | |
1765 src/main/resources/messages_de.properties, | |
1766 src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: | |
1767 i18n for ManualPointsFacets. | |
1768 | |
1769 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
1770 | |
1771 Issue 138: PDF output for calculations. | |
1772 | |
1773 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
1774 Create the PDF data source and generate the PDF report output. | |
1775 | |
1776 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
1777 Add the PDF facet to state. Add export facets only once. | |
1778 | |
1779 * doc/conf/artifacts/winfo.xml: | |
1780 Added PDF facet to state. | |
1781 | |
1782 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
1783 Added new field type 'differences'. | |
1784 | |
1785 * doc/conf/jasper/wdifferences.jasper: | |
1786 New. Template for w-differences PDF export. | |
1787 | |
1788 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
1789 | |
1790 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
1791 New method that creates and returns the chosen differences of w-difference | |
1792 calculation as string. | |
1793 | |
1794 2012-01-27 Raimund Renkert <raimund.renkert@intevation.de> | |
1795 | |
1796 Issue 138: PDF output for calculations. | |
1797 | |
1798 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
1799 Create the PDF data source and generate the PDF report output. | |
1800 | |
1801 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
1802 doc/conf/artifacts/winfo.xml: | |
1803 Added PDF facet to state. | |
1804 | |
1805 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
1806 Added new field type 'day'. | |
1807 | |
1808 * doc/conf/jasper/duration.jasper: | |
1809 New. Template for duration curve PDF report. | |
1810 | |
1811 2012-01-26 Raimund Renkert <raimund.renkert@intevation.de> | |
1812 | |
1813 Issue 138: PDF output for calculations. | |
1814 | |
1815 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
1816 Create the PDF datasource and generate the PDF report output. | |
1817 | |
1818 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
1819 doc/conf/artifacts/winfo.xml: | |
1820 Added PDF facet to state. | |
1821 | |
1822 * doc/conf/jasper/computed-discharge.jasper: | |
1823 New. Template for computed discharge PDF report. | |
1824 | |
1825 2012-01-26 Raimund Renkert <raimund.renkert@intevation.de> | |
1826 | |
1827 Issue 138: PDF output for calculations. | |
1828 | |
1829 * pom.xml: New Dependency to net.sf.jasperreports/jasperreports and | |
1830 org.codehaus.groovy/groovy-all. | |
1831 | |
1832 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
1833 Added methods for PDF generation. | |
1834 | |
1835 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
1836 Create the PDF data source and generate the PDF report output. | |
1837 | |
1838 * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: | |
1839 New. Data source for jasper reports containing the waterlevel calculation | |
1840 result. | |
1841 | |
1842 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
1843 Added facet for PDF export to state. | |
1844 | |
1845 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1846 Added PDF facet type. | |
1847 | |
1848 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
1849 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
1850 src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
1851 Added stub for inherited abstract method. | |
1852 | |
1853 * doc/conf/artifacts/winfo.xml: | |
1854 Added PDF facet to outputmode 'export'. | |
1855 | |
1856 * doc/conf/jasper, | |
1857 doc/conf/jasper/waterlevel.jasper: | |
1858 New. Folder for jasperreports templates and first template for | |
1859 waterlevel report. | |
1860 | |
1861 * src/main/resources/messages.properties, | |
1862 src/main/resources/messages_de_DE.properties, | |
1863 src/main/resources/messages_en.properties, | |
1864 src/main/resources/messages_de.properties: | |
1865 Added i18n string for calculation mode. | |
1866 | |
1867 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1868 | |
1869 Renderer 'manual' points in LongitudinalSectionGenerator. | |
1870 | |
1871 * pom.xml: New dependency to org.json/json. | |
1872 | |
1873 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1874 (doOut): Handle manual points. | |
1875 (doPoints): Add point- series. | |
1876 | |
1877 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1878 Added MANUALPOINTS Facet Type. | |
1879 | |
1880 * doc/conf/themes.xml: Added Default Theme for Manual Points. | |
1881 | |
1882 * doc/conf/artifacts/winfo.xml: Added manual point facet to | |
1883 compatibility list of longitudinal section diagram. | |
1884 | |
1885 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1886 | |
1887 Cosmetics. | |
1888 | |
1889 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, | |
1890 src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
1891 Removed obsolete imports. | |
1892 | |
1893 2012-01-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1894 | |
1895 Add initial infrastructure for user-provided data ('manual points'). | |
1896 | |
1897 * doc/conf/artifacts/manualpoints.xml: Trivial state model for new | |
1898 Artifact. | |
1899 | |
1900 * doc/conf/conf.xml: Registered manualpoint artifact and factory. | |
1901 | |
1902 * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, | |
1903 src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java, | |
1904 src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: | |
1905 New. Basic infrastructure for ManualPoints. | |
1906 | |
1907 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1908 | |
1909 * doc/conf/artifacts/winfo.xml: Removed superfluous condition checks. | |
1910 | |
1911 2012-01-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1912 | |
1913 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
1914 Cosmetics, documentation. | |
1915 | |
1916 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1917 | |
1918 * doc/conf/artifacts/winfo.xml: Add states/transitions stubs for | |
1919 "Bezugsllinenverfahren." | |
1920 | |
1921 * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, | |
1922 src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: | |
1923 Stubs for the two new states. | |
1924 | |
1925 2012-01-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1926 | |
1927 * contrib/visualize-transitions.xsl: Fixed output of the conditions | |
1928 of the transitions. Now you can see the circumstances | |
1929 when a branch is taken. | |
1930 | |
1931 2012-01-25 Raimund Renkert <raimund.renkert@intevation.de> | |
1932 | |
1933 Issue 461. | |
1934 | |
1935 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
1936 Override buildChartSection() to disable the chart subtitle entry in | |
1937 ChartSettings. | |
1938 | |
1939 2012-01-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1940 | |
1941 I18N for WINFO calculations messages. | |
1942 | |
1943 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
1944 Allow optional arguments in error messages to support meaningful | |
1945 formatting containing e.g. numbers. | |
1946 | |
1947 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
1948 Added a convenience getMsg() method. | |
1949 | |
1950 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
1951 src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, | |
1952 src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, | |
1953 src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, | |
1954 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
1955 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
1956 Adjusted the code to use the I18N symbols now. | |
1957 | |
1958 * src/main/resources/messages.properties, | |
1959 src/main/resources/messages_de_DE.properties, | |
1960 src/main/resources/messages_en.properties, | |
1961 src/main/resources/messages_de.properties: Added the I18N strings. | |
1962 | |
1963 2012-01-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1964 | |
1965 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1966 Handle the case in "W auf freier Strecke" where more than | |
1967 one Q is related to a W. TODO: Generate user report. | |
1968 | |
1969 2012-01-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1970 | |
1971 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1972 Added code for the simple case of "Bezugslinienverfahren" ("W auf freier Strecke"). | |
1973 TODO: Handle case if the model returns more than one Q for a given W. | |
1974 | |
1975 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
1976 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
1977 Micro optimizations. | |
1978 | |
1979 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1980 | |
1981 Fix flys/issue452 (Annotations at second y-axis). | |
1982 | |
1983 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1984 Added new type (duration_curve.mainvalues.q). | |
1985 | |
1986 * doc/conf/themes.xml: Added theme mapping for new facet type. | |
1987 | |
1988 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
1989 Create another Facet. | |
1990 | |
1991 * doc/conf/artifacts/winfo.xml: Added new facet type to compatibility | |
1992 list. | |
1993 | |
1994 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
1995 Handle new Facet. | |
1996 | |
1997 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
1998 Added field to be able to remember which axis to stick to. | |
1999 | |
2000 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: | |
2001 Tell Annotations to stick to Q axis in the special duration_curve | |
2002 environment. | |
2003 | |
2004 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2005 (AxisDataset): Added plotAxisIndex to now have a | |
2006 two-way-association. | |
2007 Tell own axisDatasets to which 'jfreechart'-axis they are assigned. | |
2008 Evaluate which axis the StickyAxisAnnotations should be sticked to, | |
2009 and calculate text and line positions accordingly. | |
2010 Removed junk. | |
2011 | |
2012 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2013 | |
2014 Fix compilation. | |
2015 | |
2016 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
2017 Use StickyAxisAnnotations instead of XYTextAnnotations. | |
2018 | |
2019 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2020 | |
2021 Some unification of Annotation handling. | |
2022 | |
2023 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2024 Add a third annotation type (now have text, hyk and sticky). | |
2025 | |
2026 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
2027 Use double instead of float values, removed commented code. | |
2028 | |
2029 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
2030 Reduced to keep information about placements etc only. Not a | |
2031 Annotation (in JFreeChart sense) anymore. | |
2032 | |
2033 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
2034 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, | |
2035 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
2036 Use StickyAxisAnnotations instead of XYTextAnnotations. | |
2037 | |
2038 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
2039 Added new LineStyle class. | |
2040 | |
2041 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2042 Call addAnnotationsToRenderer later, where positioning information | |
2043 is already known. | |
2044 (addAnnotationsToRenderer): Deal with the three Annotation types. | |
2045 Instead of StickyAnnotations, add | |
2046 CollisionFreeXYText- and | |
2047 XYLineAnnotations. | |
2048 (Area): Helper class. | |
2049 | |
2050 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2051 | |
2052 Some unification of Annotation handling. | |
2053 | |
2054 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
2055 | |
2056 2012-01-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2057 | |
2058 Fix flys/issue395 (SVG/PDF-Export: Längsschitt enthält keine | |
2059 Streckenfavoriten.) | |
2060 | |
2061 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
2062 Fix pdf/svg rendering of annotatios, by adding a | |
2063 ChartRenderingInfo-object to the chart.draw call. | |
2064 | |
2065 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2066 | |
2067 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2068 Added new key and getter for a short subtitle. The short subtitle is | |
2069 used if no range exists. | |
2070 | |
2071 * src/main/resources/messages.properties, | |
2072 src/main/resources/messages_de_DE.properties, | |
2073 src/main/resources/messages_en.properties, | |
2074 src/main/resources/messages_de.properties: | |
2075 Added i18n string for shor subtitle. | |
2076 | |
2077 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2078 | |
2079 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2080 Removed state validation. Validation prevents drawing the diffenrences | |
2081 diagramm and all states except of WDifferencesState always return | |
2082 true. | |
2083 | |
2084 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2085 | |
2086 * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: | |
2087 New. Candidate to replace StickyAxisAnnotation eventually. | |
2088 | |
2089 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2090 | |
2091 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
2092 Added null-guards to functions parameters. | |
2093 | |
2094 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2095 | |
2096 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2097 Respect flowing direction of river when finding valid | |
2098 hykformations. | |
2099 | |
2100 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2101 | |
2102 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2103 Add an empty facet to this state if the artifact is a Chartartifact. | |
2104 | |
2105 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2106 Do not add the range to subtitle if no range exists. | |
2107 | |
2108 2012-01-20 Raimund Renkert <raimund.renkert@intevation.de> | |
2109 | |
2110 'New chart' for cross sections. | |
2111 | |
2112 * doc/conf/artifacts/chart.xml: Updated the states and transitions for | |
2113 new charts. | |
2114 | |
2115 * doc/conf/meta-data.xml: Added cross sections to datacage. | |
2116 | |
2117 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
2118 Changed cast from WINFOArtifact to FLYSArtifact. | |
2119 | |
2120 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2121 Changed artifact data strings for chart_type. | |
2122 | |
2123 * src/main/resources/messages.properties, | |
2124 src/main/resources/messages_de_DE.properties, | |
2125 src/main/resources/messages_en.properties, | |
2126 src/main/resources/messages_de.properties: | |
2127 Changed i18n string for cross sections and logitudinal sections. | |
2128 | |
2129 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2130 | |
2131 Add basic (text) styling for HYKs. | |
2132 | |
2133 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2134 Minor cleanup, pass HYK theme on. | |
2135 | |
2136 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2137 Apply TextStyle to TextAnnotation part for HYK zones. | |
2138 | |
2139 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
2140 (TextStyle): New class to bundle text-styling info. | |
2141 | |
2142 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2143 Refactored constructors to ease setting Style in the newly | |
2144 created usage scenario. | |
2145 | |
2146 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2147 | |
2148 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2149 Cleanup. Mark spot where State-based caching could happen. | |
2150 | |
2151 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2152 | |
2153 * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: | |
2154 Cosmetics. | |
2155 | |
2156 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2157 | |
2158 * doc/conf/cache.xml: Added Cache for HYKS. | |
2159 | |
2160 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2161 | |
2162 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2163 Made HYKFactory.Zone Serializable. | |
2164 | |
2165 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2166 | |
2167 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: | |
2168 Cosmetics. | |
2169 | |
2170 2012-01-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2171 | |
2172 Added style definition for hyks. | |
2173 | |
2174 * doc/conf/themes.xml: Added hyk style (text). | |
2175 | |
2176 2012-01-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2177 | |
2178 * doc/conf/cache.xml: Removed cache "service-distanceinfo". | |
2179 | |
2180 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
2181 Now uses the annotations from the LocationProvider and the | |
2182 XML documents are no longer cached. | |
2183 | |
2184 2012-01-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2185 | |
2186 * doc/conf/cache.xml: Removed "annotations" cache. | |
2187 | |
2188 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
2189 Removed annotation caching. | |
2190 | |
2191 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
2192 Changed internal data structure to FastAnnotations which are also cached. | |
2193 | |
2194 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
2195 Use FastAnnotations now which are fetched via the LocationProvider. | |
2196 | |
2197 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Added | |
2198 time measurement for writing the CVS output. | |
2199 | |
2200 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2201 Removed superfluous import. | |
2202 | |
2203 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2204 | |
2205 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2206 Respect visibility flag of HYK facet. | |
2207 | |
2208 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2209 Log malcondition, make colored hyk-box a bit smaller. | |
2210 | |
2211 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2212 | |
2213 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
2214 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2215 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2216 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
2217 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, | |
2218 src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, | |
2219 src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
2220 Cosmetics, docs, improved logging. | |
2221 | |
2222 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2223 | |
2224 * doc/conf/meta-data.xml: Recommend hyks for current river if hit by | |
2225 a crosssection-out. | |
2226 | |
2227 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2228 | |
2229 Somewhat improved HYK handling and rendering. | |
2230 | |
2231 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: | |
2232 Store ids in more sensibly named data item and expose it. | |
2233 Spawn all facets in inactive state. | |
2234 | |
2235 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2236 Make HYK name accessible, do not query hyks by river, but by hyk-id, | |
2237 made query more real-world. | |
2238 | |
2239 * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2240 Use hyks name as facet name, pass hyk-id when asking for hyks. | |
2241 | |
2242 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2243 | |
2244 Somewhat improved HYK handling and rendering. | |
2245 | |
2246 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
2247 Added ability to store 'zones', next to text annotations. | |
2248 | |
2249 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2250 (getLowestYValue, getUppestYValue, colorForHYKZone), | |
2251 (addBoxAnnotations): New. Create box annotations from zones. | |
2252 | |
2253 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2254 (doHYK): New, handle hyk facets by adding zones to annotation | |
2255 container. | |
2256 | |
2257 2012-01-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2258 | |
2259 Preparing improved HYK handling. | |
2260 | |
2261 * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: | |
2262 (Zone.getTo): New accesor. | |
2263 TODOs and documentation added. | |
2264 | |
2265 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2266 | |
2267 'New Chart' for w-differences curve. | |
2268 | |
2269 * doc/conf/artifacts/chart.xml: Added empty facet to output mode. | |
2270 | |
2271 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2272 Add an empty facet if the artifact is a ChartArtifact. | |
2273 | |
2274 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2275 | |
2276 'New Chart' for discharge longitudinal section curve. | |
2277 | |
2278 * doc/conf/artifacts/chart.xml: Added transition for location input. | |
2279 | |
2280 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
2281 Changed cast from WINFOArtifact to FLYSArtifact. | |
2282 | |
2283 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
2284 Add an empty facet if the artifact is a ChartArtifact. | |
2285 | |
2286 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2287 | |
2288 'New Chart' for duration curve. | |
2289 | |
2290 * doc/conf/artifacts/chart.xml: Added state and transition for location input. | |
2291 | |
2292 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
2293 Changed cast from WINFOArtifact to FLYSArtifact. | |
2294 | |
2295 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: | |
2296 Add an empty facet if the artifact is a ChartArtifact. | |
2297 | |
2298 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2299 | |
2300 Added accidentally ommitted HYKFacet, fixing build. | |
2301 | |
2302 * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: | |
2303 New, stubby facet for hyk infrastructure. | |
2304 | |
2305 2012-01-18 Raimund Renkert <raimund.renkert@intevation.de> | |
2306 | |
2307 'New Chart' for computed discharge curve. | |
2308 | |
2309 * doc/conf/artifacts/chart.xml: Fixed transitions and added state for km input. | |
2310 | |
2311 * src/main/java/de/intevation/flys/artifacts/model/EmptyFacet.java: | |
2312 New. Added an empty facet to avoid deleting an empty output. | |
2313 | |
2314 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, | |
2315 src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
2316 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
2317 Changed some return values if the artifact is a ChartArtifact. | |
2318 | |
2319 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
2320 src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
2321 Changed casts from WINFOArtifact to FLYSArtifact. | |
2322 | |
2323 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
2324 Add an empty facet if the artifact is a ChartArtifact. | |
2325 | |
2326 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2327 Set a default axis range if the range is null. | |
2328 | |
2329 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2330 | |
2331 Added stub hyk infrastructure. | |
2332 | |
2333 * doc/conf/artifacts/hyk.xml: Added trivial transition configuration | |
2334 for hyk artifacts. | |
2335 | |
2336 * doc/conf/conf.xml: Register HYK artifact and its transition conf. | |
2337 | |
2338 * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, | |
2339 src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java, | |
2340 src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: | |
2341 Added static 'hyk' artifact, facet and state. | |
2342 | |
2343 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2344 | |
2345 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2346 Add 'hyk' facet type. | |
2347 | |
2348 2012-01-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2349 | |
2350 Add hyk facet to compatibility list of winfo.xml . | |
2351 | |
2352 * doc/conf/artifacts/winfo.xml: Add hyk facets to compatibility list. | |
2353 | |
2354 2012-01-18 Ingo Weinzierl <ingo@intevation.de> | |
2355 | |
2356 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
2357 method getDataAsLong that returns a Long representation of a data item or | |
2358 null if no such data item is existing or it cannot be parsed as Long. | |
2359 | |
2360 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
2361 that returns the selected reference gauge (specified by 'reference_gauge' | |
2362 parameter) of a FLYSArtifact. | |
2363 | |
2364 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2365 | |
2366 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
2367 Cache a TreeMap<km, annotation string> of the annotation values of whole | |
2368 rivers. This is _much_ more efficient than firing an HQL/SQL statement for | |
2369 each km and caching these results. | |
2370 | |
2371 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2372 | |
2373 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2374 Deleted. It is in the backend now. | |
2375 | |
2376 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
2377 src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java, | |
2378 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2379 src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java, | |
2380 src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, | |
2381 src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, | |
2382 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2383 Adjusted to use the fast cross section line from backend now. | |
2384 | |
2385 * doc/conf/cache.xml: Store cross section lines cache on disk. | |
2386 | |
2387 * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java, | |
2388 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2389 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: Removed | |
2390 superfluous imports. | |
2391 | |
2392 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2393 | |
2394 Fix assignment of stateId/hash in WaterlevelFacet. | |
2395 | |
2396 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
2397 More verbose logging, fix hash/stateid assignment. | |
2398 | |
2399 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
2400 (deepCopy): implemented. | |
2401 | |
2402 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2403 | |
2404 "Ported" StaticWQKmsArtifact to use compute-type caching mechanism. | |
2405 | |
2406 * doc/conf/artifacts/staticwqkms.xml: Declare trivial info. | |
2407 | |
2408 * doc/conf/conf.xml: Register staticwqkms artifact and factory. | |
2409 | |
2410 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: | |
2411 Sublacss DataFacet. | |
2412 | |
2413 * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java: | |
2414 New. State. | |
2415 | |
2416 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
2417 Refactored. Most computation and stuff now done in State and Facet. | |
2418 | |
2419 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2420 | |
2421 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2422 Minor cosmetics. | |
2423 | |
2424 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2425 | |
2426 Refactoring. | |
2427 | |
2428 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
2429 Added new constructor. | |
2430 | |
2431 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
2432 Refactored, subclass BlackboardDataFacet. | |
2433 | |
2434 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
2435 Refactored, subclass DataFacet. | |
2436 | |
2437 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
2438 Adjusted. | |
2439 | |
2440 2012-01-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2441 | |
2442 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
2443 Cosmetics, added new constructor. | |
2444 | |
2445 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2446 | |
2447 Use improved caching for cross section data. | |
2448 !!! This commit needs heavy testing !!! | |
2449 | |
2450 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
2451 Refactored to provide the map to determine the nearest cross section line | |
2452 neighbors for a given km to the public. This is a bit hackish because | |
2453 it hhould have its own factory which is then used by this service and | |
2454 other parts of the code. | |
2455 | |
2456 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
2457 searchCrossSectionLine() now returns a FastCrossSectionLine. To find this | |
2458 line efficiently it uses the map of the CrossSectionKMService which | |
2459 already provides a nearest neighbor searching mechanism for cross | |
2460 section lines. The FastCrossSectionLine is fetched with the | |
2461 FastCrossSectionLineFactory which uses a cache as described in the | |
2462 previous commit. | |
2463 | |
2464 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
2465 src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, | |
2466 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2467 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
2468 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Uses | |
2469 the FastCrossSectionLine instead of CrossSectionLines now. | |
2470 | |
2471 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2472 Added method fetchCrossSectionProfile() to access the point data in | |
2473 the profile generating compatible way. | |
2474 | |
2475 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: Removed | |
2476 superfluous import. | |
2477 | |
2478 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2479 | |
2480 * doc/conf/cache.xml: Added cache for fast section lines chunks. | |
2481 | |
2482 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java: | |
2483 New. Chunks of FastCrossSectionLines. Stores cross section lines for ranges | |
2484 of one KM. | |
2485 | |
2486 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java: | |
2487 New. Access fast cross section lines. It uses the cache 'fast-cross-section-lines' | |
2488 configured in cache.xml to store chunks of cross section lines. | |
2489 | |
2490 * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: | |
2491 New. Stores the important data (points) of a cross section line. | |
2492 | |
2493 2012-01-16 Ingo Weinzierl <ingo@intevation.de> | |
2494 | |
2495 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
2496 Added a new calculation option for historical discharge curves. | |
2497 | |
2498 * src/main/resources/messages.properties, | |
2499 src/main/resources/messages_de_DE.properties, | |
2500 src/main/resources/messages_en.properties, | |
2501 src/main/resources/messages_de.properties: Added translations for | |
2502 historical discharge curves. | |
2503 | |
2504 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2505 | |
2506 * doc/conf/artifacts/winfo.xml: Added certain facets to to | |
2507 compatibility matrices. | |
2508 | |
2509 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2510 | |
2511 * doc/conf/artifacts/annotation.xml: Fixed accidental change. | |
2512 | |
2513 2012-01-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2514 | |
2515 * doc/conf/artifacts/annotation.xml: Cosmetics. | |
2516 | |
2517 2012-01-16 Ingo Weinzierl <ingo@intevation.de> | |
2518 | |
2519 * doc/conf/meta-data.xml: Enabled old floodmap calculations for output | |
2520 type 'map'. | |
2521 | |
2522 2012-01-13 Raimund Renkert <raimund.renkert@intevation.de> | |
2523 | |
2524 Initial implementation for module 'new chart'. | |
2525 | |
2526 * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: | |
2527 New. Artifact for module 'new chart'. | |
2528 | |
2529 * doc/conf/artifacts/chart.xml: | |
2530 New. Artifact description for the new artifact. | |
2531 | |
2532 * doc/conf/conf.xml: | |
2533 Added new artifact to config. | |
2534 | |
2535 * src/main/resources/messages.properties, | |
2536 src/main/resources/messages_de_DE.properties, | |
2537 src/main/resources/messages_en.properties, | |
2538 src/main/resources/messages_de.properties: | |
2539 Added i18n strings for 'new chart' chart types. | |
2540 | |
2541 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2542 | |
2543 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
2544 Cosmetics. | |
2545 | |
2546 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2547 | |
2548 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
2549 Avoid NPE when copying data from one artifact to another. | |
2550 | |
2551 2011-01-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2552 | |
2553 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2554 (expandRange): Prevent collapse due to negative values. | |
2555 | |
2556 2012-01-12 Raimund Renkert <raimund.renkert@intevation.de> | |
2557 | |
2558 * doc/conf/artifacts/map.xml, | |
2559 doc/conf/conf.xml, | |
2560 src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
2561 Changed the MapArtifact name to 'new_map'. | |
2562 | |
2563 2011-01-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2564 | |
2565 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
2566 Added code to calculate the area of the generated polygons. | |
2567 TODO: Render the generated area sum to the plot. | |
2568 | |
2569 2011-01-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2570 | |
2571 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
2572 Replaced System.err.println()s with proper logging. | |
2573 | |
2574 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
2575 src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java, | |
2576 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
2577 superfluous imports. | |
2578 | |
2579 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2580 | |
2581 flys/issue450 (i18n: Datenkorb: longitudinal-section) | |
2582 | |
2583 * doc/conf/meta-data.xml: Replaced dash by underscore in | |
2584 longitudinal-section. | |
2585 | |
2586 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2587 | |
2588 Towards areas on other than the first axes. | |
2589 | |
2590 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
2591 Changed signature on which to provide data via the blackboard. | |
2592 Include facets name to allow unique identification. | |
2593 | |
2594 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
2595 Store name of one of the facets involved in area creation. | |
2596 (AreaFacet.Data): New class to hold result data. | |
2597 | |
2598 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2599 New methods to find out whether we have a general Q or W type of | |
2600 facet. | |
2601 | |
2602 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
2603 (doArea): Use new Result-Data object instead of Object[], resolve | |
2604 which axis to put area to. | |
2605 (axisIdxForFacet): New. | |
2606 | |
2607 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2608 Subclass LongitudinalSectionGenerator. | |
2609 | |
2610 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2611 | |
2612 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
2613 Do not intefere with CrossSections. | |
2614 | |
2615 2011-01-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2616 | |
2617 Cosmetics, cleanups. | |
2618 | |
2619 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2620 (getCrossSections, getCrossSectionNames): Removed. | |
2621 | |
2622 2011-01-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2623 | |
2624 flys/issue439 (Streckenfavoriten lassen sich nicht über den Datenkorb | |
2625 hinzuladen) | |
2626 | |
2627 * doc/conf/meta-data.xml: Made Annotations available via datacage | |
2628 in longitudinal section, cosmetics. | |
2629 | |
2630 2012-01-11 Raimund Renkert <raimund.renkert@intevation.de> | |
2631 | |
2632 * doc/conf/conf.xml: | |
2633 Added output generator for output type 'map'. | |
2634 | |
2635 * doc/conf/artifacts/map.xml: | |
2636 Changed output name to 'map'. | |
2637 | |
2638 * doc/conf/meta-data.xml: | |
2639 Added new output type 'map'. | |
2640 | |
2641 2011-01-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2642 | |
2643 Fix flys/issue446 (Dauerline/Abflusskurve am Pegel: Eigenschaften vom | |
2644 Hauptwertthema nicht aufrufbar) | |
2645 | |
2646 * doc/conf/themes.xml: Add default styles for mainvalues.q/w and other | |
2647 themes. | |
2648 | |
2649 2012-01-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2650 | |
2651 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
2652 Removed XPath injection security hole. A serious one because it allowed | |
2653 inspecting the conf.xml file ... with all the db passwords. | |
2654 | |
2655 2012-01-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2656 | |
2657 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, | |
2658 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2659 Removed superfluous imports. | |
2660 | |
2661 2012-01-11 Ingo Weinzierl <ingo@intevation.de> | |
2662 | |
2663 * doc/conf/meta-data.xml: Added the definition of old calculation results | |
2664 for floodmaps. | |
2665 | |
2666 2012-01-10 Ingo Weinzierl <ingo@intevation.de> | |
2667 | |
2668 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Added | |
2669 methods getLayers() and removeLayer(). | |
2670 | |
2671 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
2672 method getFacets() which returns a list of Facets supported by this | |
2673 Artifact. In addition, the FLYSArtifact is now more verbose while | |
2674 filtering Facets for Outputs. | |
2675 | |
2676 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2677 Implemented initialize() which now copies the shapefile directory of the | |
2678 model Artifact and modifies its Facets (adapts the shapepath which is the | |
2679 uuid of the Artifact). | |
2680 | |
2681 2012-01-10 Ingo Weinzierl <ingo@intevation.de> | |
2682 | |
2683 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
2684 src/main/java/de/intevation/flys/collections/OutputParser.java: Made | |
2685 them more verbose for better debugging. | |
2686 | |
2687 2012-01-09 Ingo Weinzierl <ingo@intevation.de> | |
2688 | |
2689 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
2690 Initialize() now also calls State.initialize() for each State. | |
2691 | |
2692 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2693 Override initialize() which is defined in AbstractState. NOTE: Currently, | |
2694 this method has no code. | |
2695 | |
2696 2012-01-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2697 | |
2698 * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: | |
2699 New. The service to invalidate the caches. (Argh! Forgot to 'svn add') | |
2700 | |
2701 2012-01-06 Ingo Weinzierl <ingo@intevation.de> | |
2702 | |
2703 flys/issue298 (Karte: Automatischer Zoom auf Berechnungsergebnisse) | |
2704 | |
2705 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Added a | |
2706 debug statement that prints out the WSPLGEN extent. | |
2707 | |
2708 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create new | |
2709 Envelope instances for initial and max extent if they are not existing. | |
2710 Some debug statements have now been removed. | |
2711 | |
2712 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2713 | |
2714 Add cache for 'static' wqkms (e.g. BaseData) to default cache conf. | |
2715 | |
2716 * doc/conf/cache.xml: Add Cache Config for static wqkms. | |
2717 | |
2718 * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: | |
2719 Adjust typo in cache name, minor cosmetic. | |
2720 | |
2721 2011-01-06 Raimund Renkert <raimund.renkert@intevation.de> | |
2722 | |
2723 * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
2724 The map artifact has two states now and overrides describe() to | |
2725 generate UI sections in the describe response. | |
2726 The map state overrides computeAdvance() instead of computeFeed(). | |
2727 | |
2728 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
2729 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: | |
2730 Changed the WMSDBArtifact in WMSDBState to FLYSArtifact and adjusted | |
2731 constructors in state classes. | |
2732 | |
2733 * doc/conf/artifacts/map.xml: | |
2734 Added initial state and transition. | |
2735 | |
2736 * src/main/resources/messages.properties, | |
2737 src/main/resources/messages_de_DE.properties, | |
2738 src/main/resources/messages_en.properties, | |
2739 src/main/resources/messages_de.properties: | |
2740 Added i18n strings for new state. | |
2741 | |
2742 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2743 | |
2744 Partial fix for flys/issue437 (Querprofil: Zugeladene Basisdaten | |
2745 ignorieren W/Q-heit, falsche Namen). | |
2746 | |
2747 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
2748 Set name also for first column (zero based). | |
2749 | |
2750 2012-01-06 Ingo Weinzierl <ingo@intevation.de> | |
2751 | |
2752 flys/issue196 (i18n/l10n: Zahlenformate einheitlich) | |
2753 | |
2754 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: New method | |
2755 getRawValue() that extracts the raw double value from 'name' parameter. | |
2756 | |
2757 * src/main/java/de/intevation/flys/utils/Formatter.java: New method | |
2758 getRawFormatter() that returns a NumberFormat instance for the current | |
2759 locale. | |
2760 | |
2761 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
2762 Localized the W/Q labels in CSV exports. | |
2763 | |
2764 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2765 | |
2766 flys/issue442 (i18n: Datenkorb: flood-protections) | |
2767 | |
2768 * doc/conf/meta-data.xml: Replaced dash in flood-protection by | |
2769 underscore to allow translation. | |
2770 | |
2771 2011-01-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2772 | |
2773 flys/issue438 (i18n: Datenkorb: additionals) | |
2774 | |
2775 * doc/conf/meta-data.xml: Fix typo. | |
2776 | |
2777 2011-01-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2778 | |
2779 * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: | |
2780 New. Uses the CacheFactory to invalidate caches by their names. | |
2781 This can be used by external ETL processes like the AFT/DIPS importer | |
2782 to prevent cache inconsistencies. | |
2783 | |
2784 Input documents look like this: | |
2785 | |
2786 <caches> | |
2787 <cache name="my-cache"/> | |
2788 ... | |
2789 <cache name="your-cache"/> | |
2790 </caches> | |
2791 | |
2792 Output documents look like this: | |
2793 | |
2794 <caches> | |
2795 <cache name="my-cache">All elements removed.</cache> | |
2796 ... | |
2797 <cache name="your-cache">Error: Cache not found.</cache> | |
2798 </caches> | |
2799 | |
2800 * doc/conf/conf.xml: Added the cache invalidation service. | |
2801 | |
2802 * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: | |
2803 Added Override annotation. | |
2804 | |
2805 2011-01-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2806 | |
2807 flys/issue432 (Diagrammeigenschaften/Flächenrenderer: | |
2808 Legenden-schriftgröße für Flächenthemen wird ignoriert) | |
2809 | |
2810 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2811 Respect legend item size when generating legend items for | |
2812 area dataseries. | |
2813 | |
2814 2011-12-09 Raimund Renkert <raimund.renkert@intevation.de> | |
2815 | |
2816 Implemented new module "new map". | |
2817 | |
2818 * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: | |
2819 New. Artifact for the new module, extends RiverAxisArtifact and | |
2820 contains the MapState class. | |
2821 | |
2822 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
2823 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: | |
2824 Added empty constructor to embedded state classes to allow instantiation | |
2825 of MapState that extends the RiverAxisState. | |
2826 | |
2827 * src/main/java/de/intevation/flys/exports/MapGenerator.java: | |
2828 Do not generate an initialExtent element if the initial extent is | |
2829 empty. | |
2830 | |
2831 * doc/conf/artifacts/map.xml: | |
2832 New. Describes the state for the new module. | |
2833 | |
2834 * doc/conf/conf.xml: | |
2835 Added new config file. | |
2836 | |
2837 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
2838 | |
2839 flys/issue444 (error_no_export_found bei "W bei ungleichwertigem Abfluss") | |
2840 | |
2841 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: If no boolean | |
2842 value "wq_free" exists in getWQMode(), false is the default. | |
2843 | |
2844 2011-01-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2845 | |
2846 flys/issue443 (Querprofile: Hibernate LazyInitializationException) | |
2847 | |
2848 * doc/conf/cache.xml: Disable cache for cross-sections. | |
2849 | |
2850 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
2851 | |
2852 flys/issue447 (W-Differenzen: Fehler beim Hinzufügen einer Parameterisierung) | |
2853 | |
2854 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
2855 Added a new method cleanEmptyOutputs() which removes Outputs that have | |
2856 no Facets set. | |
2857 | |
2858 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Call | |
2859 CollectionAttribute.cleanEmptyOutputs() at the end of write() to remove | |
2860 empty Outputs that have been added during the merge process. | |
2861 | |
2862 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
2863 | |
2864 flys/issue440 (Karte: WSPLGEN Berechnungen für Mosel schlagen fehl) | |
2865 | |
2866 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Modified the | |
2867 getRiverBoundary() method because the signature of | |
2868 RiverAxis.getRiverAxis() has changed. This method will now take each | |
2869 geometry into account, that is retrieved by | |
2870 RiverAxis.getRiverBoundary(). | |
2871 | |
2872 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
2873 Use GeometryUtils.getRiverBoundary() to determine the boundary of a | |
2874 river. | |
2875 | |
2876 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2877 Create the riveraxis shapefile with all geometries returned by | |
2878 RiverAxis.getRiverAxis(). | |
2879 | |
2880 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
2881 | |
2882 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Repaired | |
2883 broken items in legend. The new renderer requires the current plot. This | |
2884 is set now. | |
2885 | |
2886 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
2887 | |
2888 * doc/conf/themes.xml: Added a new field 'pointsize' to the virtual theme | |
2889 'HiddenColorLines'. | |
2890 | |
2891 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to | |
2892 parse the new field of 'HiddenColorLines'. | |
2893 | |
2894 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Apply the | |
2895 pointsize defined in themes. | |
2896 | |
2897 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
2898 | |
2899 * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
2900 Use correct keys for buffering in getMinimum() and getMaximum(). | |
2901 | |
2902 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
2903 | |
2904 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java, | |
2905 src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
2906 src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
2907 Moved to de.intevation.flys.jfree. | |
2908 | |
2909 * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java, | |
2910 src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, | |
2911 src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: | |
2912 Moved from de.intevation.flys.exports. | |
2913 | |
2914 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
2915 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
2916 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
2917 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
2918 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
2919 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
2920 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
2921 Added necessary imports. | |
2922 | |
2923 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
2924 | |
2925 * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
2926 Buffered the computation results of getMinimum() and getMaximum(). | |
2927 | |
2928 2012-01-04 Ingo Weinzierl <ingo@intevation.de> | |
2929 | |
2930 flys/issue393 (Themenstileditor: Minimum anzeigen / Beschriftung anzeigen) | |
2931 | |
2932 * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: | |
2933 New renderer that overrides JFreeChart's XYLineAndShapeRenderer. This | |
2934 renderer brings the option to explicitly display the minimum and/or | |
2935 maximum or a series as shape. Currently, there are no options to adjust | |
2936 the style of those shapes. | |
2937 | |
2938 * doc/conf/themes.xml: Added a new virtual theme 'MinMaxPoints'. All line | |
2939 theme inherit from that theme now. | |
2940 | |
2941 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to | |
2942 parse the fields 'showminimum' and 'showmaximum' of 'MinMaxPoints' theme. | |
2943 | |
2944 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added | |
2945 methods to apply the fields of the new Theme 'MinMaxPoints'. | |
2946 | |
2947 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Modified | |
2948 the getRenderer() method which now always returns a new instance of | |
2949 EnhancedLineAndShapeRenderer. | |
2950 | |
2951 2011-01-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2952 | |
2953 Allow styling of outline of areas. | |
2954 | |
2955 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
2956 Allow styling of outline of areas. | |
2957 | |
2958 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
2959 Parse outline style for areas, apply it to renderer. | |
2960 | |
2961 2012-01-03 Ingo Weinzierl <ingo@intevation.de> | |
2962 | |
2963 flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) | |
2964 | |
2965 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Call | |
2966 the new flys-backend method Wst.determineMinMaxQFree() to determine the | |
2967 min/max Qs at a given kilometer. | |
2968 | |
2969 2011-01-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2970 | |
2971 * doc/conf/themes.xml: Reflect name chnage of longitudinal sections | |
2972 area artifacts and include ColorLine style for area styles. | |
2973 | |
2974 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
2975 | |
2976 flys/issue370 (WINFO: Berechnungsausgabe W/Pegel [cm] fehlt bei Wasserspiegellage und W am Pegel) | |
2977 | |
2978 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New method that | |
2979 extracts the double value of a WQ object's name. | |
2980 | |
2981 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Adapted | |
2982 the header of CSV exports and the content of the "W at gauge" column. | |
2983 | |
2984 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
2985 Adapted method signatures that have been changed in WaterlevelExporter. | |
2986 | |
2987 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
2988 | |
2989 * src/main/resources/messages.properties, | |
2990 src/main/resources/messages_de_DE.properties, | |
2991 src/main/resources/messages_en.properties, | |
2992 src/main/resources/messages_de.properties: Added strings used in the CSV | |
2993 export. | |
2994 | |
2995 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
2996 | |
2997 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Check | |
2998 if the location of a CSV row is in range of the reference gauge. Write | |
2999 "outside reference gauge" into CSV in such cases. | |
3000 | |
3001 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3002 | |
3003 PART II of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) | |
3004 | |
3005 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Add the | |
3006 named main value of a Q and the name of the gauge used for the calculation | |
3007 if the WQ mode is "W at gauge" or "Q at gauge". | |
3008 | |
3009 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
3010 Adapted the method signatures that have been modified in | |
3011 WaterlevelExporter. | |
3012 | |
3013 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3014 | |
3015 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
3016 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3017 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3018 src/main/java/de/intevation/flys/exports/AxisSection.java, | |
3019 src/main/java/de/intevation/flys/exports/ExportSection.java, | |
3020 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3021 src/main/java/de/intevation/flys/exports/ChartSection.java: Removed | |
3022 unused imports. | |
3023 | |
3024 2012-01-02 Ingo Weinzierl <ingo@intevation.de> | |
3025 | |
3026 PART I of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) | |
3027 | |
3028 * doc/conf/cache.xml: Registered a new Cache for the LocationProvider. | |
3029 | |
3030 * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | |
3031 New. This class is able to return the description of a location based on a | |
3032 river and kilometer parameter. The LocationProvider stores single | |
3033 locations into a Cache if one is configured for this class. | |
3034 | |
3035 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
3036 Added a method that returns a single Annotation for a specific kilometer and | |
3037 river. | |
3038 | |
3039 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
3040 getLocationDescription() that might be used to determine the description | |
3041 of a specified kilometer for a given river. | |
3042 | |
3043 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Make use | |
3044 of FLYSUtils.getLocationDescription() to add a new column that contains | |
3045 the location description. | |
3046 | |
3047 2011-12-29 Ingo Weinzierl <ingo@intevation.de> | |
3048 | |
3049 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Write | |
3050 min/max values for free Qs into Artifact's DESCRIBE document. | |
3051 | |
3052 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3053 | |
3054 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fixed | |
3055 broken order to determine the step width of Qs and Ws. | |
3056 | |
3057 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3058 | |
3059 flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) | |
3060 | |
3061 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3062 Validate user defined free Q values. | |
3063 | |
3064 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
3065 | |
3066 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3067 Compute better step width based on a maximal number of steps = 30. | |
3068 Results with digits are rounded up. E.g.: | |
3069 Q range = 9.6 - 1750 | |
3070 Step width = 58.01 | |
3071 Rounded result = 60 | |
3072 | |
3073 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3074 | |
3075 * src/main/java/de/intevation/flys/exports/AxisSection.java, | |
3076 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3077 src/main/java/de/intevation/flys/exports/ChartSection.java: Subclasses | |
3078 TypeSection to be able to use convinience methods for string, integer, | |
3079 double and boolean values. | |
3080 | |
3081 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3082 | |
3083 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: The | |
3084 getSize() method now returns null if no width and height is specified in | |
3085 the request document or if width/height <= 0. It no longer returns the | |
3086 result of getDefaultSize(). | |
3087 | |
3088 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Set the | |
3089 size of a chart export to the size specified in the ChartSettings if | |
3090 there are no valid values in the request document. | |
3091 | |
3092 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Set the | |
3093 chart size to ChartGenerator.getDefaultSize() if no valid values are | |
3094 returned by ChartGenerator.getSize(). This has been done autoamtically | |
3095 before. | |
3096 | |
3097 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3098 | |
3099 * src/main/java/de/intevation/flys/exports/TypeSection.java: New. This | |
3100 Section defines some convinience methods to add/set string, integer, | |
3101 double and boolean values. | |
3102 | |
3103 * src/main/java/de/intevation/flys/exports/ExportSection.java: New. | |
3104 Subclasses TypeSection. The ExportSection currently offers attributes | |
3105 'width' and 'height'. | |
3106 | |
3107 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added | |
3108 getter/setter methods to support an ExportSection. | |
3109 | |
3110 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create an | |
3111 ExportSection while initial ChartSettings creation. | |
3112 | |
3113 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3114 | |
3115 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added and | |
3116 make use of a new method createLegendLabelFont() to create unified Fonts for | |
3117 LegendItems. This method considers the user defined size for LegendItems. | |
3118 | |
3119 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3120 | |
3121 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3122 Implemented adjustAxes(). This method now sets the label Font of the X | |
3123 axis. Its size is determined by getXAxisLabelFontSize(). | |
3124 | |
3125 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3126 | |
3127 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added method | |
3128 getFontSize() to retrieve the font size for an axis. | |
3129 | |
3130 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3131 Modified createYAxis(int): call super.createYAxis(int) and adjust | |
3132 necessary settings - no Axis creation takes place here. | |
3133 | |
3134 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
3135 getXAxisLabelFontSize() and getYAxisLabelFontSize(int) to retrieve the | |
3136 user defined font size for an axis. The getYAxisLabelFontSize() is used in | |
3137 createYAxis(int) to set the font size for axes labels. | |
3138 | |
3139 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3140 | |
3141 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3142 Override getYAxisWalker(). | |
3143 | |
3144 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create new | |
3145 instances of IdentifiableNumberAxis in createYAxis(int) default | |
3146 implementation. | |
3147 | |
3148 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3149 | |
3150 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added | |
3151 getLabel() to retrieve the axis label. | |
3152 | |
3153 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3154 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3155 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3156 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3157 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3158 Override getDefaultXAxisLabel() and getDefaultYAxisLabel() defined in | |
3159 XYChartGenerator. | |
3160 | |
3161 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implement | |
3162 getXAxisLabel() and getYAxisLabel(int). Both methods search for an axis | |
3163 label defined in the ChartSettings first. If no label is specified or if | |
3164 no ChartSettings is set, getDefaultXAxisLabel() or | |
3165 getDefaultYAxisLabel(int) is called to retrieve the initial/default axis | |
3166 label. | |
3167 | |
3168 2011-12-27 Ingo Weinzierl <ingo@intevation.de> | |
3169 | |
3170 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Modified the | |
3171 signature of addAxisSection(). This method now accepts AxisSections only. | |
3172 In addition, there is a new method getAxisSection(String) that returns an | |
3173 AxisSection specified by its identifier. | |
3174 | |
3175 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added new | |
3176 methods getIdentifier(), isFixed(), getUpperRange() and getLowerRange() to | |
3177 retrieve the attributes supported by this Section. | |
3178 | |
3179 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use | |
3180 of axes ranges specified in ChartSettings if an axis is fixed. | |
3181 | |
3182 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3183 | |
3184 * src/main/java/de/intevation/flys/exports/IdentifiableNumberAxis.java: New. | |
3185 Subclasses JFreeChart's NumberAxis and offers a getId() method which | |
3186 returns an identifiable key. | |
3187 | |
3188 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implements | |
3189 a createNumberAxis() method that should be used by all subclasses to | |
3190 create new axes. This method returns an instance of IdentifiableNumberAxis | |
3191 which is required for zooming. | |
3192 | |
3193 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3194 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3195 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3196 Create new NumberAxis instances by using XYChartGenerator.createNumberAxis(). | |
3197 | |
3198 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3199 | |
3200 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3201 Implemented the methods getChartTitle() and getChartSubtitle(). Both | |
3202 methods try to get the required information from ChartSettings. If no | |
3203 ChartSettings is set for this OutGenerator, these methods will call | |
3204 getDefaultChartTitle() and getDefaultChartSubtitle(). | |
3205 | |
3206 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3207 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3208 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3209 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3210 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
3211 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
3212 Renamed getChartTitle() and getChartSubtitle() to | |
3213 getDefaultChartTitle() and getDefaultChartSubtitle(). In addition, the | |
3214 methods addSubtitles() became more robust - these OutGenerators add | |
3215 subtitles only if the subtitle is not empty. | |
3216 | |
3217 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3218 | |
3219 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a | |
3220 setSettings(Settings) method. | |
3221 | |
3222 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3223 Call OutGenerator.setSettings() before calling doOut() for each Facet. | |
3224 | |
3225 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Implemented | |
3226 setSettings() and added convinience methods to access chart specific | |
3227 settings. | |
3228 | |
3229 * src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
3230 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
3231 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
3232 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
3233 src/main/java/de/intevation/flys/exports/ReportGenerator.java: Implemented | |
3234 setSettings(). | |
3235 | |
3236 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3237 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use | |
3238 of the attributes specified in the Settings: the title, subtitle, | |
3239 displayGrid and displayLegend settings are functional now. | |
3240 | |
3241 2011-12-23 Ingo Weinzierl <ingo@intevation.de> | |
3242 | |
3243 * src/main/java/de/intevation/flys/exports/ChartSettings.java, | |
3244 src/main/java/de/intevation/flys/exports/LegendSection.java, | |
3245 src/main/java/de/intevation/flys/exports/ChartSection.java: Use more | |
3246 concrete classes than Settings and Section in these classes to avoid a lot | |
3247 of castings. | |
3248 | |
3249 2011-12-22 Ingo Weinzierl <ingo@intevation.de> | |
3250 | |
3251 flys/issue242 (W-INFO: Fehlende Header in Datenexporten) | |
3252 | |
3253 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added functions | |
3254 getQs(), getWs(), getGauge(), getGaugename() and getRivername() that all | |
3255 take a parameter FLYSArtifact. | |
3256 | |
3257 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Moved the | |
3258 implementation of getGauge() to FLYSUtils. The getGauge() in this class | |
3259 just calls and returns FLYSUtils.getGauge(). | |
3260 | |
3261 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Write a | |
3262 header into a CSV export containing meta information about this export. | |
3263 | |
3264 * src/main/resources/messages.properties, | |
3265 src/main/resources/messages_de_DE.properties, | |
3266 src/main/resources/messages_en.properties, | |
3267 src/main/resources/messages_de.properties: Added strings used in the CSV | |
3268 export as header. | |
3269 | |
3270 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3271 | |
3272 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3273 (getKm): Removed, not called anymore. | |
3274 | |
3275 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3276 | |
3277 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3278 Include km of cross-section-master in diagrams subtitle (fetched | |
3279 from 'blackboard'. | |
3280 | |
3281 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3282 | |
3283 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: | |
3284 Cosmetics, docs. | |
3285 | |
3286 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3287 | |
3288 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java | |
3289 (getInitialFacetActivity): Only newest CrossSection is initially | |
3290 active. | |
3291 | |
3292 2011-12-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3293 | |
3294 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java | |
3295 (isNewest): New, query whether a CrossSection is the newest for its | |
3296 river, doc. | |
3297 | |
3298 2011-12-21 Ingo Weinzierl <ingo@intevation.de> | |
3299 | |
3300 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
3301 convinience method to retrieve the value of an data object stored at | |
3302 FLYSArtifact as Boolean value. | |
3303 | |
3304 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method that | |
3305 returns the named value of a given double value. This method returns only | |
3306 the named value, if the WQ mode is "Q at gauge" and if the value fits to a | |
3307 named value. In addition to this method, there is a new method to retrieve | |
3308 the selected WQ mode as 'WQ_MODE' enum. | |
3309 | |
3310 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
3311 Removed prepareData() and its call. The data preparation had a bad side | |
3312 effect: the modifications are "persisted" into cache, which has again bad | |
3313 side effects. | |
3314 | |
3315 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Removed | |
3316 prepareData(). The label creation for columns in the WST export will now | |
3317 take place in addWSTColumn(). With help of the master Artifact (I forgot | |
3318 this Artifact in my last commit) we are able to replace Q values with | |
3319 their named main value. | |
3320 | |
3321 2011-12-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3322 | |
3323 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3324 Cover 'locations' case for initial km of cross section artifacts. | |
3325 | |
3326 2011-12-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3327 | |
3328 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3329 (initialize): Eat ld_from from master artifact. | |
3330 (setup): Set cross_section.km to either masters km or the lowest | |
3331 defined cross-section line, whatever is bigger. | |
3332 | |
3333 2011-12-21 Ingo Weinzierl <ingo@intevation.de> | |
3334 | |
3335 flys/issue252 (W-INFO: Wasserspiegellagenberechnung / Mitführung der Jährlichkeiten in der Diagramm-/Ergbnisausgabe) | |
3336 | |
3337 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
3338 stripNamedMainValue(). The result of this function is a named main value's | |
3339 base name without declaration of a year. | |
3340 | |
3341 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a | |
3342 method pepareData() that is called in doOut() before the data supported by | |
3343 the current Facet is added using addData(). | |
3344 | |
3345 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Override | |
3346 the prepareData() method to reset the name of WQKms objects. The Qs in a | |
3347 waterlevel export should be the Q value or the named main value if the | |
3348 value fits to a named main value. | |
3349 | |
3350 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3351 | |
3352 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3353 Survive cases where the first dataset has an area-renderer assigned. | |
3354 | |
3355 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3356 | |
3357 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: | |
3358 Store additional parameter (whether or not to fill everything in | |
3359 between two curves.) | |
3360 | |
3361 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3362 Deliver additional info from artifact. | |
3363 | |
3364 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3365 Evaluate new parameter. | |
3366 | |
3367 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3368 | |
3369 * doc/conf/themes.xml: Add transparency setting to area theme style. | |
3370 | |
3371 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Helper to | |
3372 access transparency setting in theme. | |
3373 | |
3374 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
3375 Respect transparency setting. | |
3376 | |
3377 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3378 | |
3379 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
3380 Subclass BlackboardDataFacet to provide data for area calculation. | |
3381 | |
3382 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3383 Cast data to WKms instead of WQKms. | |
3384 | |
3385 2011-12-20 Ingo Weinzierl <ingo@intevation.de> | |
3386 | |
3387 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3388 Use a ';' as seperator between Qs and Ws. | |
3389 | |
3390 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3391 | |
3392 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java | |
3393 (doOut, doArea): Added handling for areafacets. Code yet mostly | |
3394 copied from CrossSectionGenerator. | |
3395 | |
3396 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3397 | |
3398 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
3399 Refactoring, subclass BlackboardDataFacet, remove duplicate code. | |
3400 | |
3401 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3402 | |
3403 Cosmetics. | |
3404 | |
3405 * doc/conf/artifacts/winfo.xml, | |
3406 src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3407 Renamed facet for consistency reasons. | |
3408 | |
3409 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3410 | |
3411 Make Waterlevelfacet deliver data via blackbord. | |
3412 | |
3413 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
3414 Subclass BlackboardDataFacet. | |
3415 | |
3416 2011-12-20 Ingo Weinzierl <ingo@intevation.de> | |
3417 | |
3418 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
3419 Create all formatted string labels for Ws and Qs in this class, because | |
3420 this class is the only instance that knows that there are double values | |
3421 to format. | |
3422 | |
3423 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3424 | |
3425 Introduced new Facet that will deliver whatever getData returns via | |
3426 blackbord under key which is defined by convention. Attention, the | |
3427 data is not cached if handled this way. | |
3428 | |
3429 * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: | |
3430 New facet, will be useful for easing implementation of facets that | |
3431 can contribute to area-computations. | |
3432 | |
3433 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3434 | |
3435 * src/main/java/de/intevation/flys/exports/VisibleAttribute.java: | |
3436 Removed obsolete imports. | |
3437 | |
3438 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3439 | |
3440 Removed obsolete imports. | |
3441 | |
3442 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, | |
3443 src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, | |
3444 src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java, | |
3445 src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, | |
3446 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3447 Removed obsolete imports. | |
3448 | |
3449 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3450 | |
3451 With StableXYDifferenceRenderer, create legend items in rectangular | |
3452 form, to discern "line" from "area" in legend. | |
3453 | |
3454 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java | |
3455 (legendLine, legendShape): Renamed. | |
3456 (getLegendItem): Create LegendItem with fill, use PositivePaint for | |
3457 that. | |
3458 | |
3459 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3460 | |
3461 Added further 'area' infrastructure. | |
3462 | |
3463 * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: | |
3464 New, "area dataset". | |
3465 | |
3466 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
3467 (doOut): Use helper to decide if facet is an 'area' facet. | |
3468 (doArea): Construct StyledAreaSeriesCollection instead of two | |
3469 dataseries. | |
3470 | |
3471 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3472 (AxisDataset.isArea): Distinguish area datasets with instanceof. | |
3473 (AxisDataset.addArea): New. Replaces addAreaDataset. | |
3474 (addAreaSeries): Simplified with new custom SeriesCollection. | |
3475 (applyTheme): Register and style StableXYDifferenceRenderer for | |
3476 StyledAreaSeriesCollections. | |
3477 Added various TODOs and debug output to stabilize development. | |
3478 | |
3479 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3480 | |
3481 * doc/conf/artifacts/winfo.xml: Added facets to compatibility | |
3482 matrices. | |
3483 | |
3484 * doc/conf/themes.xml: Added Area theme defaults. | |
3485 | |
3486 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3487 | |
3488 Lay ground for having areas in longitudinal section diagrams, too. | |
3489 This is done by different naming of the facets. | |
3490 | |
3491 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3492 Make the name dynamic. | |
3493 | |
3494 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3495 Added further facet types, helper. | |
3496 | |
3497 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: | |
3498 Store name for facets in data item, restrict access to some fields. | |
3499 | |
3500 * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
3501 Use AreaArtifacts data item to use name for facets. | |
3502 | |
3503 2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3504 | |
3505 Cosmetics. | |
3506 | |
3507 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java, | |
3508 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
3509 src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
3510 Doc. | |
3511 | |
3512 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
3513 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
3514 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
3515 Whitespace. | |
3516 | |
3517 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Doc and | |
3518 whitespace. | |
3519 | |
3520 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3521 | |
3522 * src/main/java/de/intevation/flys/utils/ThemeUtil.java | |
3523 (parseBoolean): New, extracted, updated callers. | |
3524 (parseFillColorField, parseShowBorder): New, for area styles. | |
3525 | |
3526 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3527 | |
3528 flys/issue202 (W-INFo: Wasserspiegellagenberechnung / Vorbelegung Strecke) | |
3529 | |
3530 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
3531 Added a system property which is used to determine, if the DESCRIBE | |
3532 document of an Artifact should include default values (values, that have | |
3533 been inserted by the user some time ago) or not. The default case is, | |
3534 that the DESCRIBE does NOT include default values. To enable default | |
3535 values, set "flys.use.default.values" to "true". | |
3536 | |
3537 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3538 | |
3539 flys/issue419 (Themen-Name "Q(null)" bei W bei ungl. A.) | |
3540 | |
3541 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
3542 Use correct variable to create Facet names. | |
3543 | |
3544 2011-12-19 Ingo Weinzierl <ingo@intevation.de> | |
3545 | |
3546 flys/issue380 (W-INFO / Überschwemmungskarte, falsches DGM) | |
3547 | |
3548 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
3549 convinience method that returns a parameter of FLYSArtifact as Integer. | |
3550 | |
3551 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Override | |
3552 validate() to determine, if the DGM selected by the user is valid for the | |
3553 current calculation range and river. | |
3554 | |
3555 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3556 | |
3557 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3558 Roll-back accidentally committed changes. | |
3559 | |
3560 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3561 | |
3562 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
3563 (doOut): Hide 'invisible' (deleted) themes from Outgenerators. | |
3564 | |
3565 2011-12-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3566 | |
3567 Added area.name data item and access to areaartifact. | |
3568 | |
3569 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: | |
3570 Rephrased debug output, do survive case where only one curve is | |
3571 given for area calculation (this is the "above" or "under" case). | |
3572 | |
3573 * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java | |
3574 (getAreaName): Access "area.name" data item. | |
3575 | |
3576 * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
3577 Respect area.name data of artifact when reproducing facets. | |
3578 | |
3579 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3580 | |
3581 * doc/conf/conf.xml: Fix, accidentally added wrong factory in last | |
3582 commit. | |
3583 | |
3584 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3585 | |
3586 * doc/conf/conf.xml: Register area artifact factory. | |
3587 | |
3588 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3589 | |
3590 * doc/conf/artifacts/winfo.xml: Added area artifacts to cross-section | |
3591 compatibility matrix. | |
3592 | |
3593 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3594 | |
3595 Add area dataseries when facet delivering one. | |
3596 | |
3597 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java | |
3598 (doOut): Handle area facets. | |
3599 (doArea): Register areas for area facets. | |
3600 | |
3601 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3602 | |
3603 Add simple area registerig functions. | |
3604 | |
3605 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3606 (AxisDataset.addAreaDataset): New, add an area dataset. | |
3607 (AxisDataset.isArea): New. | |
3608 (addAreaSeries): New. Add Area Dataset. | |
3609 (applyThemes): Pass info if we have an area, to set different | |
3610 renderer. | |
3611 | |
3612 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3613 | |
3614 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
3615 Added convenience function and easy sybclassing. | |
3616 | |
3617 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3618 | |
3619 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3620 Register AREA ("area") facet type. | |
3621 | |
3622 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3623 | |
3624 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, | |
3625 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
3626 Register blackboard key uuid+index and respond with data to it, as | |
3627 assumed by the areaartifact and facet. | |
3628 | |
3629 2011-12-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3630 | |
3631 Added partial area-infrastructure. | |
3632 | |
3633 * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, | |
3634 src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, | |
3635 src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: | |
3636 New artifact, facet and state for area rendering. | |
3637 | |
3638 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3639 | |
3640 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Defined an | |
3641 interface YAxisWalker that allows to walk over each Y axis definition in | |
3642 subclasses. This walker can be retrieved using the new getYAxisWalker() | |
3643 method. The AxisSections are built in this class now. | |
3644 | |
3645 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3646 Implemented the YAxisWalker interface and the getYAxisWalker() method. | |
3647 Removed the code to build AxisSections. | |
3648 | |
3649 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
3650 Implemented getYAxisLabel(int pos) and getYAxisWalker(). | |
3651 | |
3652 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
3653 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
3654 Implemented the getYAxisWalker() method. | |
3655 | |
3656 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3657 | |
3658 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3659 Some optimizations during out() operation - the CollectionAttribute is | |
3660 parsed a single time now (*i guess*). This code really needs some | |
3661 refactoring! | |
3662 | |
3663 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3664 | |
3665 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3666 Added an INFO message that displays the duration time for the out() | |
3667 operation. | |
3668 | |
3669 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3670 | |
3671 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3672 Calls super.buildAxisSections(). | |
3673 | |
3674 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3675 Implemented the method buildAxisSections(). The result list will contain | |
3676 an AxisSection for the X axis. | |
3677 | |
3678 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3679 | |
3680 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Bugfix: | |
3681 Add new Outputs to the current CollectionAttribute if no old one is | |
3682 existing. | |
3683 | |
3684 2011-12-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3685 | |
3686 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
3687 Directly fetch key/value pairs when writing a collection attribute. | |
3688 | |
3689 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3690 | |
3691 * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added new | |
3692 functions that allow parsing a ChartSettings object from DOM Node. | |
3693 | |
3694 * src/main/java/de/intevation/flys/collections/AttributeParser.java: Parse | |
3695 the Settings of each Output. | |
3696 | |
3697 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3698 | |
3699 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
3700 Added a method to set a new Settings object for a specific Output and a | |
3701 method to clear the list of Facets of a specific Output. | |
3702 | |
3703 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: The | |
3704 AttributeWriter no longer creates new CollectionAttributes - it only | |
3705 modifies the old CollectionAttribute. At first, it clears the Facets of | |
3706 all Outputs. Finally, the merged Facets are added to the Outputs. | |
3707 | |
3708 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3709 Added the CollectionAttribute to the AttributeWriters constructor. | |
3710 | |
3711 2011-12-16 Ingo Weinzierl <ingo@intevation.de> | |
3712 | |
3713 * src/main/java/de/intevation/flys/exports/DoubleAttribute.java: New. An | |
3714 Attribute that stores double values. | |
3715 | |
3716 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods | |
3717 to set values for 'fixation', 'font-size', 'lower' and 'upper'. | |
3718 | |
3719 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3720 Set new attributes mentioned above for each axis' AxisSection. | |
3721 | |
3722 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
3723 | |
3724 * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods | |
3725 to set the axis label and id. | |
3726 | |
3727 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Improved | |
3728 the ChartSettings that will now contain a set of AxisSections. The new | |
3729 buildAxisSections() method in this class is not implemented and needs to | |
3730 be implemented by subclasses. | |
3731 | |
3732 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3733 Override buildAxisSections() of XYChartGenerator to create an AxisSection | |
3734 for each axis that is able to be displayed in this sort of chart. In | |
3735 addition, there is a new method getYAxisLabel(int) that returns the label | |
3736 for a specific Y axis. | |
3737 | |
3738 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
3739 | |
3740 * src/main/java/de/intevation/flys/exports/IntegerAttribute.java: New. | |
3741 Concrete subclass of a DefaultAttribute for storing integer values. | |
3742 | |
3743 * src/main/java/de/intevation/flys/exports/LegendSection.java: New. A | |
3744 concrete Section subclass to store legend specific attributes. | |
3745 | |
3746 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
3747 src/main/java/de/intevation/flys/exports/StringAttribute.java: Removed | |
3748 needless import of org.w3c.dom.Attr. | |
3749 | |
3750 * src/main/java/de/intevation/flys/exports/ChartSettings.java: ChartSettings | |
3751 is able to store a Section for legends now. | |
3752 | |
3753 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added | |
3754 methods to retrieve the font size of legends and if the legend should be | |
3755 visible or not. In addition, the ChartSettings returned by this instance | |
3756 will now contain a LegendSection as well. | |
3757 | |
3758 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
3759 | |
3760 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Introduced | |
3761 methods getChartSubtitle() and isGridVisible(). getChartSubtitle() returns | |
3762 in this implementation null. Concrete subclasses should override this | |
3763 mehtod if they require subtitles in charts. isGridVisible() determines if | |
3764 the grid in the chart should be visible or not. This method return always | |
3765 true in this implementation. | |
3766 In addition, the Settings object returned by getSettings() will now have a | |
3767 ChartSection set properly. | |
3768 | |
3769 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
3770 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
3771 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3772 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
3773 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
3774 Override getChartSubtitle(). | |
3775 | |
3776 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
3777 | |
3778 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3779 Prepare the OutGenerator (process each of the Output's Facets) during the | |
3780 describe() operation to be able to return an initial Settings object. | |
3781 | |
3782 2011-12-15 Ingo Weinzierl <ingo@intevation.de> | |
3783 | |
3784 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
3785 src/main/java/de/intevation/flys/exports/VisibleAttribute.java, | |
3786 src/main/java/de/intevation/flys/exports/StringAttribute.java: Fixed wrong | |
3787 usage of DOM operations. | |
3788 | |
3789 2011-12-14 Ingo Weinzierl <ingo@intevation.de> | |
3790 | |
3791 * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, | |
3792 src/main/java/de/intevation/flys/exports/VisibleAttribute.java, | |
3793 src/main/java/de/intevation/flys/exports/StringAttribute.java: New. | |
3794 Concrete subclasses of a DefaultAttribute. | |
3795 | |
3796 * src/main/java/de/intevation/flys/exports/ChartSettings.java, | |
3797 src/main/java/de/intevation/flys/exports/AxisSection.java, | |
3798 src/main/java/de/intevation/flys/exports/ChartSection.java: | |
3799 Implementations for chart settings. WORK IN PROGRESS! | |
3800 | |
3801 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Override | |
3802 the getSettings() method. The implementation here returns a ChartSettings | |
3803 instance. | |
3804 | |
3805 * src/main/java/de/intevation/flys/exports/EmptySettings.java: Modified the | |
3806 node name of the settings ("art:settings" -> "settings"). | |
3807 | |
3808 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3809 | |
3810 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3811 Cosmetics, doc. | |
3812 | |
3813 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3814 | |
3815 Cosmetics. | |
3816 | |
3817 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
3818 Remove needless imports. | |
3819 | |
3820 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3821 | |
3822 Fix/Guard certain misconditions. | |
3823 | |
3824 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Do | |
3825 not crash when given null-range. | |
3826 | |
3827 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
3828 Do not crash when given malformed array. | |
3829 | |
3830 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3831 | |
3832 Cosmetics. | |
3833 | |
3834 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, | |
3835 ChangeLog: Whitespace cosmetic. | |
3836 | |
3837 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3838 Annotation cosmetic. | |
3839 | |
3840 * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: | |
3841 Convenience cosmetic. | |
3842 | |
3843 * src/main/java/de/intevation/flys/utils/DataUtil.java: | |
3844 vim-magicosmetic. | |
3845 | |
3846 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3847 | |
3848 Implement new WaterLineArtifact where needed so far. | |
3849 | |
3850 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
3851 Declare that we implement WaterLineArtifact. | |
3852 | |
3853 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
3854 (getWaterLines): Implement to fulfil new WaterLineArtifact- | |
3855 interface-impl. Also generate new Facet. | |
3856 | |
3857 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
3858 Do not depend on WINFOArtifacts, but on WaterLineArtifacts instead. | |
3859 | |
3860 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3861 | |
3862 Added interface WaterLineArtifact to be implemented by artifacts | |
3863 that know how to create a water line "against" a cross section. | |
3864 | |
3865 * src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java: | |
3866 New, straight-forward interface. | |
3867 | |
3868 2011-12-14 Ingo Weinzierl <ingo@intevation.de> | |
3869 | |
3870 * src/main/java/de/intevation/flys/exports/EmptySettings.java: An | |
3871 implementation of the Settings interface defined in the artifact-database | |
3872 module. This implementation accepts no Section objects at all and creates | |
3873 an empty "settings" Node in its toXML() operation. | |
3874 | |
3875 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Defined a new | |
3876 method getSettings() that returns a Settings instance. | |
3877 | |
3878 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
3879 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
3880 src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
3881 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
3882 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
3883 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
3884 Implemented the getSettings() operation. All OutGenerators will currently | |
3885 return an instance of EmptySettings. | |
3886 | |
3887 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3888 Before the DESCRIBE document is created, we gonna evaluate each Output | |
3889 defined in the Collection's attribute document, if it has a Settings | |
3890 object set. If this is not the case, the relevant OutGenerator is called | |
3891 to retrieve a new instance of Settings. | |
3892 | |
3893 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
3894 Append the Settings of Outputs to the Output nodes in the XML | |
3895 representation. | |
3896 | |
3897 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3898 | |
3899 Recommend cross-sections. | |
3900 | |
3901 * doc/conf/meta-data.xml: When having a cross-section out, recommend | |
3902 respective artifacts. | |
3903 | |
3904 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3905 | |
3906 Register factory for CrossSectionArtifacts. | |
3907 | |
3908 * doc/conf/conf.xml: Register CrossSectionArtifact-Factory. | |
3909 | |
3910 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
3911 | |
3912 * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: | |
3913 New. This class will store the information provided in the Collection's | |
3914 attribute (which is a DOM document). | |
3915 | |
3916 * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: | |
3917 Store an instance of CollectionAttribute and append its XML representation | |
3918 to the DESCRIBE document. | |
3919 | |
3920 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Removed | |
3921 all DOM operations from this writer. Its new task is to create a new | |
3922 CollectionAttribute object which represents a merged version of the old | |
3923 CollectionAttribute and the information provided by the Collection's child | |
3924 Artifacts. | |
3925 | |
3926 * src/main/java/de/intevation/flys/collections/AttributeParser.java: The | |
3927 result of AttributeParser's parse() operation is a CollectionAttribute | |
3928 object now. The methods getOuts() and getFacets() are as of now proxy | |
3929 methods that call the relevant methods of CollectionAttribute. | |
3930 | |
3931 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3932 Some structural changes in the process to build the attribute Document of | |
3933 the Collection's DESCRIBE. We will no longer work with Document during | |
3934 this process but with instances of CollectionAttribute. | |
3935 | |
3936 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3937 | |
3938 Server-side of newer Cross-Section diagram construction architecture. | |
3939 | |
3940 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
3941 (searchCrossSectionKmLine, getCrossSectionSnapKm), | |
3942 (getCrossSectionData): Removed, most functionality contained in | |
3943 CrossSectionArtifact. | |
3944 (getWaterLines): Now get CrossSectionLines to calculate water line. | |
3945 | |
3946 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
3947 Get a CrossSectionLine from blackboard. | |
3948 | |
3949 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
3950 Hard TODO, commented out function needed for subtitle to allow | |
3951 compilation. | |
3952 | |
3953 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
3954 Added Empty-Dataset- guard. | |
3955 | |
3956 2011-12-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3957 | |
3958 Cosmetics. | |
3959 | |
3960 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
3961 Cosmetics. | |
3962 | |
3963 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
3964 | |
3965 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java, | |
3966 src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
3967 Removed superfluous imports. | |
3968 | |
3969 2011-12-13 Ingo Weinzierl <ingo@intevation.de> | |
3970 | |
3971 * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: | |
3972 New. This class helps generating the DESCRIBE document of a collection. | |
3973 | |
3974 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3975 Moved some of the code to create the DESCRIBE document out to | |
3976 CollectionDescriptionHelper. | |
3977 | |
3978 2011-12-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3979 | |
3980 Resolve todo about wrongly named cross sections. | |
3981 Open StaticState to allow that facets survive a compute. | |
3982 | |
3983 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java | |
3984 (computeAdvance, computeFeed, computeInit): Override to call | |
3985 staticCompute. | |
3986 (staticCompute): New. Do nothing but be able to be overridden. | |
3987 | |
3988 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java | |
3989 (setup): Fetch facets name from db (resolves todo). | |
3990 (getCurrentState): override staticstates staticcompute to let | |
3991 facets survive a compute. | |
3992 | |
3993 2011-12-12 Ingo Weinzierl <ingo@intevation.de> | |
3994 | |
3995 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java, | |
3996 src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java: Renamed | |
3997 JobExecutor to WSPLGENCallable (because it is a Callable now). In addition | |
3998 to the call() method which starts the WSPLGEN process, this Callable | |
3999 offers a cancelWSPLGEN() method to destroy a running WSPLGEN process. | |
4000 | |
4001 * src/main/java/de/intevation/flys/wsplgen/WSPLGENFuture.java: A FutureTask | |
4002 that overrides cancel(boolean). Before this instance call | |
4003 super.cancel(boolean), it executes WSPLGENCallable.cancelWSPLGEN() to kill | |
4004 a running WSPLGEN process. | |
4005 | |
4006 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: The Scheduler is | |
4007 no longer a Runnable. It makes now use of a ScheduledThreadPoolExecutor to | |
4008 schedule the incoming WSPLGENJobs. The ScheduledThreadPoolExecutor has a | |
4009 fixed number of worker threads that process the jobs. The number is 1 per | |
4010 default; it can be modified using a System property "wsplgen.max.threads". | |
4011 | |
4012 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
4013 a string constant SCHEDULER. | |
4014 | |
4015 * src/main/java/de/intevation/flys/wsplgen/SchedulerSetup.java: A | |
4016 LifetimeListener that currently implements the systemUp() method to create | |
4017 an instance of Scheduler. After its creation, the Scheduler is put into | |
4018 the GlobalContext using FLYSContext.SCHEDULER as key. | |
4019 | |
4020 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
4021 Fetch the Scheduler from GlobalContext. | |
4022 | |
4023 * doc/conf/conf.xml: Registered SchedulerSetup as LifetimeListener. | |
4024 | |
4025 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4026 | |
4027 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | |
4028 (describe): Add data items to StaticFLYSArtifacts describe-doc. | |
4029 | |
4030 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4031 | |
4032 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
4033 (addDefaultChartOutput): Convenienve function to add a chart-output. | |
4034 | |
4035 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4036 | |
4037 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
4038 Play nice with CrossSectionArtifact. Employ blackboard. | |
4039 | |
4040 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4041 Spawn a CrossSectionFacet, handle various data. | |
4042 | |
4043 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
4044 Do not produce CrossSectionFacets anymore, these now "belong" to | |
4045 CrossSectionArtifacts. | |
4046 | |
4047 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4048 | |
4049 * doc/conf/cache.xml: Added cross_sections cache. | |
4050 | |
4051 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4052 | |
4053 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java: | |
4054 (getCrossSection, getCrossSectionUncached): New, access specific | |
4055 CrossSection, employ caching. | |
4056 | |
4057 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4058 | |
4059 * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: | |
4060 New artifact to handle cross-section access. | |
4061 | |
4062 2011-12-09 Raimund Renkert <raimund.renkert@intevation.de> | |
4063 | |
4064 Issue 413. | |
4065 | |
4066 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
4067 Apply point size from theme attribute linewidth. | |
4068 | |
4069 2011-12-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4070 | |
4071 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
4072 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
4073 src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
4074 src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
4075 Cosmetics. | |
4076 | |
4077 2011-12-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4078 | |
4079 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
4080 Documentation added, let a value be its own neighbour (distance 0). | |
4081 | |
4082 2011-12-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4083 | |
4084 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
4085 Added "Bezugslinie" to list of calculation alternatives. | |
4086 | |
4087 * src/main/resources/messages.properties, | |
4088 src/main/resources/messages_de_DE.properties, | |
4089 src/main/resources/messages_de.properties: Added I18N. | |
4090 | |
4091 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4092 | |
4093 Further flys/issue420 fix (No Discharge Curves for Mosel). | |
4094 | |
4095 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4096 (includeYRange, mergeRanges): Moved NaN-guard to lowest level. | |
4097 (combineXRanges): Also NaN guard the X Axis extent. | |
4098 | |
4099 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4100 | |
4101 Partial fix for flys/issue420 (Berechnete Abflusskurve: Kein Diagramm für | |
4102 Mosel). Protect axis extent calculation from empty or invalid | |
4103 datasets. | |
4104 | |
4105 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4106 (includeRange, includeYRange): Renamed, updated callers. | |
4107 (includeYRange): Protect from merging extent with NaNs. | |
4108 (debugDatasets): Be more verbose on the datasets. | |
4109 (zoom): Doc. | |
4110 | |
4111 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4112 | |
4113 Fix flys/issue423 (Diagramm: Hauptwerte bei Abflusskurve am Pegel | |
4114 werden an Y-Achse nicht angezeigt) - show not "raw" (vs interpolated) | |
4115 values at Gauge. | |
4116 | |
4117 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
4118 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
4119 Add parameterization to let facet know whether to fetch data at | |
4120 Gauges or at Artifacts position. | |
4121 | |
4122 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
4123 Let the MainValueFacets know whether to ask for interpolated | |
4124 MainValues; (do not interpolate for Gauges Main Values). | |
4125 (getMainValuesQ, getMainValuesW): Added parameter to control | |
4126 interpolation. | |
4127 | |
4128 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4129 | |
4130 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified | |
4131 prefix constants for Mapserver layers and renamed constants (which have | |
4132 been postfixes before). | |
4133 | |
4134 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Adjusted | |
4135 usage of Mapserver constants to the changes described above. | |
4136 | |
4137 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4138 | |
4139 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
4140 Bugfix: Evaluate the correct parameter whether to set the floodplain or | |
4141 not. In addition, the scenario parameter used by WSPLGEN is now set | |
4142 correctly. | |
4143 | |
4144 >>>>>>> .r3356 | |
4145 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4146 | |
4147 Allow longitudinal_section.q facets in wdiff states output. | |
4148 | |
4149 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets | |
4150 to w-diff states out compatibility- matrix. | |
4151 | |
4152 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4153 | |
4154 Refactored Longitudinal*/WDiff-*Generator hierarchy and change axis | |
4155 ordering, resolved label-i18n TODO. | |
4156 | |
4157 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4158 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4159 Merge, avoid duplicate code, fix axis ordering in w-diff diagram, | |
4160 label in ls-diagramm. | |
4161 | |
4162 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | |
4163 | |
4164 * src/main/resources/messages.properties, | |
4165 src/main/resources/messages_de_DE.properties, | |
4166 src/main/resources/messages_en.properties, | |
4167 src/main/resources/messages_de.properties: Added missing state titles. | |
4168 | |
4169 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4170 | |
4171 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
4172 Do not include zero on first axis. | |
4173 | |
4174 2011-12-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4175 | |
4176 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4177 (buildArtifactNode): Include artifacts state data in description | |
4178 document of collection. | |
4179 | |
4180 2011-11-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4181 | |
4182 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4183 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4184 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
4185 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
4186 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4187 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4188 src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
4189 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
4190 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
4191 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4192 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4193 src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
4194 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4195 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
4196 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4197 Removed superfluous imports. | |
4198 | |
4199 2011-11-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4200 | |
4201 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4202 Removed import to make it compileable again. | |
4203 | |
4204 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4205 | |
4206 Introduce pre-rendering inter-facet communication phase ('blackboard | |
4207 pass'). | |
4208 | |
4209 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
4210 (doBlackboardPass): New. Before actually calling doOut, bundle | |
4211 ArtifactAndFacets and let them register | |
4212 themselfes as DataProvider in CallContext if they | |
4213 want ("announce on blackboard"). | |
4214 | |
4215 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4216 | |
4217 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java | |
4218 (doOut): Adjusted signature. | |
4219 | |
4220 2011-11-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4221 | |
4222 Changed doOut signature to use ArtifactAndFacet, which will be | |
4223 side effect of upcoming "blackboard" feature. | |
4224 | |
4225 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
4226 (getRangesForDataset, getRangesForAxis): Renamed, removed TODO. | |
4227 | |
4228 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java | |
4229 (createAxis): Update call to XYChartGenerator.getRangesForAxis, | |
4230 cosmetics. | |
4231 | |
4232 * src/main/java/de/intevation/flys/exports/OutGenerator.java | |
4233 (doOut): Changed Signature to accet ArifactAndFacet instead of | |
4234 Artifact and Facet. | |
4235 | |
4236 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4237 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4238 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
4239 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
4240 src/main/java/de/intevation/flys/exports/MapGenerator.java, | |
4241 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4242 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
4243 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
4244 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
4245 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4246 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4247 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4248 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java | |
4249 (doOut): Adjusted to new signature. | |
4250 | |
4251 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
4252 (adjustAxes): Removed, we do not need a (manual) second axis. | |
4253 | |
4254 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4255 | |
4256 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4257 Fix compilation, use features of XYChartGenerator. | |
4258 | |
4259 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4260 Set default behaviour such that 0 is not included in ranges. | |
4261 | |
4262 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
4263 Set behaviour of axis such that 0 is not (automagically) included. | |
4264 | |
4265 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4266 | |
4267 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
4268 Fix wrong documentation. | |
4269 | |
4270 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4271 | |
4272 Fix LongitudinalSections multi-axes plotting behavior. | |
4273 | |
4274 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4275 Removed obsolete functions, use better working multi-axis | |
4276 magic by XYChartGenerator. | |
4277 | |
4278 2011-11-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4279 | |
4280 Overhaul dataset/axis/renderer housekeeping in Mother of all | |
4281 ChartGenerators. | |
4282 | |
4283 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4284 Refactored, keep axis/rendering relevant information in objects | |
4285 of new class AxisDataset. Removed some obsolete code while adding | |
4286 documentation. | |
4287 | |
4288 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4289 | |
4290 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): | |
4291 Added the implementation of the 'Bezugslinienverfahren'. Should | |
4292 be complete but needs testing! | |
4293 TODO: Setup a Calculation and integrate it into WINFO. | |
4294 | |
4295 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4296 | |
4297 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4298 Refactored the code for the "berechnete Abflusskurve" to enable | |
4299 the "Bezugslinienverfahren" to use the same code paths. It also | |
4300 removes a good deal of already existing code duplication. | |
4301 | |
4302 2011-11-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4303 | |
4304 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(findQsForW): | |
4305 Added method findQsForW(w, km) to retrieve the Qs that correspond | |
4306 for the given w and km. | |
4307 | |
4308 This is to be called when doing a "W auf freier Strecke" calculation | |
4309 to find out the Qs belonging to the user given W. | |
4310 | |
4311 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, | |
4312 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4313 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4314 Removed superfluous imports. | |
4315 | |
4316 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4317 | |
4318 Fix bug when adding Q data in LongitudinalSectionGenerator. | |
4319 | |
4320 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4321 Add data from Q -Facet as Q over Km points. | |
4322 | |
4323 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4324 | |
4325 Added handling of empty plots. | |
4326 | |
4327 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4328 (createAxes, removeEmptyRangeAxes): Survive empty datasets map, create | |
4329 primary axis. | |
4330 (recoverEmptyPlot): New. | |
4331 | |
4332 2011-11-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4333 | |
4334 Let first visible axis be always on the left. | |
4335 | |
4336 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4337 (createAxes): When creating axes, keep track of which is the first | |
4338 one. Set its location to "left". | |
4339 | |
4340 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4341 | |
4342 Use multiple axis in relevant generators. | |
4343 | |
4344 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4345 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4346 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4347 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4348 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4349 (createYAxis): Implemented. | |
4350 Define and use YAXIS enum for axes. | |
4351 | |
4352 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4353 | |
4354 Fix theming and legend items for plot with multiaxis feature. | |
4355 Decouple renderer index from dataset index. | |
4356 | |
4357 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4358 (applyThemes): Do not get renderer based on dataset/axis-index but | |
4359 count. | |
4360 | |
4361 2011-11-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4362 | |
4363 In XYChartGenerators allow more than two datasets. | |
4364 Assign axis to indices of datasets, do not show axis if corresponding | |
4365 dataset is set to be not visible. | |
4366 Do proper axis-setting in LongitudinalSectionGenerator only (other | |
4367 will follow). Based on a patch by Sascha Teichmann. | |
4368 | |
4369 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4370 Keep relation between index and dataset, once its added. Compute | |
4371 ranges per index. Allow subclasses to override createAxes to specify | |
4372 internationalized labels etc. | |
4373 | |
4374 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4375 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4376 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
4377 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4378 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
4379 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
4380 Add datasets to first index. | |
4381 | |
4382 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4383 Implement createYAxis to create correct first, second and third | |
4384 axis. Added enum to easy identification of axis. Stripped down | |
4385 adjustAxis which was used to create second axis. | |
4386 Add datasets at correct indices. | |
4387 | |
4388 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4389 | |
4390 * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, | |
4391 src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, | |
4392 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
4393 Cosmetics, docs. | |
4394 | |
4395 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4396 | |
4397 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
4398 Cosmetics, docs. | |
4399 | |
4400 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4401 | |
4402 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
4403 Cosmetics, docs. | |
4404 | |
4405 2011-11-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4406 | |
4407 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
4408 Resolved TODO about caching certain WstValueTables. | |
4409 | |
4410 2011-11-22 Ingo Weinzierl <ingo@intevation.de> | |
4411 | |
4412 * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: New. | |
4413 This Artifact is used to allow users adding external WMS layers to their | |
4414 floodmaps. An ExternalWMSArtifact stores an URL of a WMS, the name and the | |
4415 title of the WMS layer. The internal State extends WMSBackgroundState. | |
4416 | |
4417 * doc/conf/conf.xml: Registered the ExternalWMSArtifact. | |
4418 | |
4419 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a | |
4420 new type "floodmap.externalwms" which is used by the ExternalWMSArtifact. | |
4421 | |
4422 * doc/conf/artifacts/winfo.xml: Allowed the "floodmap.externalwms" facet for | |
4423 floodmaps. | |
4424 | |
4425 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
4426 Some refactoring to allow easier subclassing. | |
4427 | |
4428 2011-11-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4429 | |
4430 Fixed flys/411. | |
4431 | |
4432 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
4433 Use different queries to avoid costy joins. | |
4434 | |
4435 2011-11-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4436 | |
4437 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
4438 Use different queries to avoid costy joins. Patch by Sascha | |
4439 Teichmann, minor typo-fix. | |
4440 | |
4441 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4442 | |
4443 * doc/conf/artifacts/winfo.xml: Added other.wkms.interpol facet | |
4444 to compatibility matrix for computed discharge curves. | |
4445 | |
4446 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4447 | |
4448 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
4449 Resolve cosmetic todo, use importData-convenience method. | |
4450 | |
4451 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4452 | |
4453 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4454 Handle STATIC_WKMS_INTERPOL and WQ/Points as Annotations. | |
4455 | |
4456 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4457 | |
4458 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4459 Give Facet different name when its a flood*, so that it can be | |
4460 understood to be e.g. a flood-protection further down the processing | |
4461 line. | |
4462 | |
4463 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4464 | |
4465 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4466 Prevent ArrayIndexOutOfBounds, log method entry. | |
4467 | |
4468 2011-11-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4469 | |
4470 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4471 Added new Facet Type: Interpolated W/Km values. | |
4472 | |
4473 2011-11-16 Ingo Weinzierl <ingo@intevation.de> | |
4474 | |
4475 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, | |
4476 src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, | |
4477 src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Avoid | |
4478 WMS layer names that begin with digits. This would lead to invalid | |
4479 WMSGetFeatureInfo responses, where the name of a layer is the name of a | |
4480 XML node. | |
4481 | |
4482 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4483 | |
4484 * doc/conf/meta-data.xml: Added and use *_wq macros for interpolated | |
4485 w/q data (currently used in computed discharge curve only). | |
4486 | |
4487 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4488 | |
4489 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4490 Handle STATIC_WQ_ANNOTATION type facets, build and add annotations | |
4491 for these. | |
4492 | |
4493 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4494 | |
4495 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4496 Set Facet type (name) based on static datas name (special case | |
4497 everything starting with "height"). | |
4498 | |
4499 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4500 | |
4501 * doc/conf/artifacts/winfo.xml: Extended compatibility matrices. | |
4502 | |
4503 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4504 | |
4505 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4506 Added new STATIC_WQ_ANNOTATIONS Facet Type. | |
4507 | |
4508 2011-11-16 Ingo Weinzierl <ingo@intevation.de> | |
4509 | |
4510 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4511 Added a method isQueryable() that determines if a layer is queryable via | |
4512 WMS GetFeatureInfo request. This method returns false as default. | |
4513 | |
4514 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
4515 Override isQueryable(). All WMSDBLayerFacets are queryable via WMS | |
4516 GetFeatureInfo request. | |
4517 | |
4518 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4519 | |
4520 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4521 Added functionality to artifact to use single column wst | |
4522 interpolators. | |
4523 | |
4524 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4525 | |
4526 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
4527 Added methods to create WstValueTables (interpolators) for specific | |
4528 columns of wsts. | |
4529 | |
4530 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4531 | |
4532 * doc/conf/themes.xml: Added Point Style for other.wq data. | |
4533 | |
4534 2011-11-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4535 | |
4536 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4537 Do not re-evaluate constant size() in for-loops. | |
4538 | |
4539 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4540 | |
4541 * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4542 Get ld_locations not locations data item to determine km. | |
4543 (getDataAsDouble): New helper function to get data item as double. | |
4544 | |
4545 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4546 | |
4547 * doc/conf/meta-data.xml: Recommend fixations for computed discharge | |
4548 curve outs, minor refactoring of dc conf. | |
4549 | |
4550 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4551 | |
4552 * doc/conf/conf.xml: Added wqinterpol factory to produce | |
4553 WQKmsInterpolArtifacts. | |
4554 | |
4555 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4556 | |
4557 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4558 Use StyledSeriesBuilder to add WQ data from WQKms to Series. | |
4559 | |
4560 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4561 | |
4562 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
4563 Handle interpolated WQ data. | |
4564 | |
4565 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4566 | |
4567 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
4568 Adjusted to similar implementations. Added TODO about merging with | |
4569 these similar implementations. | |
4570 | |
4571 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4572 | |
4573 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4574 Removed logging noise, find better suited rows for interpolation. | |
4575 | |
4576 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4577 | |
4578 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
4579 Cache WstValueTables that were fetched by wst_id. | |
4580 | |
4581 2011-11-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4582 | |
4583 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
4584 (getWstName): Fix and use SQL statement. | |
4585 | |
4586 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4587 | |
4588 * src/main/java/de/intevation/flys/artifacts/model/WQFacet.java, | |
4589 src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: | |
4590 Added new Facet and Artifact to access W over Q data. | |
4591 | |
4592 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4593 | |
4594 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
4595 (importData): New function to copy data from one artifact to | |
4596 another. | |
4597 | |
4598 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4599 | |
4600 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java | |
4601 (getTable): New methods to get WstValueTable for given wst_id. | |
4602 Prepolate Arrays with NaNs. | |
4603 | |
4604 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4605 | |
4606 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
4607 (getWKmsName): Fix definition. | |
4608 | |
4609 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4610 | |
4611 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
4612 (getWKmsName): New function. Get name (description) of a WST. | |
4613 | |
4614 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4615 | |
4616 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
4617 Added new "other.wq"/STATIC_WQ Facet-Type, e.g. for fixations in | |
4618 discharge curves. | |
4619 | |
4620 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4621 | |
4622 Picky cosmetics. | |
4623 | |
4624 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java, | |
4625 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, | |
4626 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
4627 src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
4628 Cosmetics, docs. | |
4629 | |
4630 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4631 | |
4632 Added translations for Mosel, Elbe and Saar. | |
4633 | |
4634 * src/main/resources/messages.properties, | |
4635 src/main/resources/messages_de_DE.properties, | |
4636 src/main/resources/messages_en.properties, | |
4637 src/main/resources/messages_de.properties: Added translations | |
4638 for Mosel, Elbe, Saar. | |
4639 | |
4640 2011-11-15 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4641 | |
4642 Added new interpolation mechanism to WstValueTable to interpolate | |
4643 given columns only. | |
4644 | |
4645 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java | |
4646 (linearW): New, interpolate a given columns w's between given rows. | |
4647 (interpolateWQColumnwise): New, interpolate between rows ws at a | |
4648 given column and km. | |
4649 | |
4650 2011-11-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4651 | |
4652 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4653 Minor doc added. | |
4654 | |
4655 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4656 | |
4657 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, | |
4658 src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, | |
4659 src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
4660 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4661 src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, | |
4662 src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
4663 Removed dead ';' from empty bodies. | |
4664 | |
4665 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4666 | |
4667 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
4668 s/reset/resetQuick/s in TDoubleArrayLists. | |
4669 | |
4670 2011-11-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4671 | |
4672 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4673 Added system properties 'waterlevel' and 'km'. Useful to | |
4674 init the UI with a given waterlevel and drawing the cross-sections | |
4675 at the given km. | |
4676 | |
4677 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
4678 Spliting by NaNs definition holes _should_ work now. Needs | |
4679 some more testing. | |
4680 TODOs: | |
4681 - Use log4j instead of println for logging. | |
4682 - Subclass XYDifferenceRenderer instead of replacing it totally. | |
4683 | |
4684 2011-11-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4685 | |
4686 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4687 Draw water, too. | |
4688 | |
4689 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
4690 First code to split datasets by NaNs. WIP. | |
4691 | |
4692 2011-11-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4693 | |
4694 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4695 Draw ground with StableXYDifferenceRenderer. | |
4696 | |
4697 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
4698 Removed XYDatasetToZeroMapper stuff. Not needed any longer | |
4699 because we use rendereres on dataset basis now. | |
4700 | |
4701 * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: | |
4702 Removed.Not longer needed. | |
4703 | |
4704 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4705 | |
4706 * doc/conf/meta-data.xml: Include computed discharge curves in dc | |
4707 conf. | |
4708 | |
4709 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4710 | |
4711 * doc/conf/meta-data.xml: Somewhat unify user-part of dc config. | |
4712 | |
4713 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
4714 | |
4715 * doc/conf/themes.xml: Modified some floodmap styles and added a | |
4716 backgroundcolor attribute to polygon themes. | |
4717 | |
4718 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
4719 Added support for backgroundcolor. | |
4720 | |
4721 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Parse | |
4722 backgroundcolor from theme document. If a value is given, the | |
4723 backgroundcolor is set on the Mapserver style. | |
4724 | |
4725 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
4726 | |
4727 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
4728 Set correct Mapserver attribute name to adjust the width of a line. | |
4729 | |
4730 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
4731 | |
4732 * doc/conf/themes.xml: Added 'textcolor' and 'textsize' attributes to the | |
4733 existing 'Kms' theme. | |
4734 | |
4735 * doc/conf/mapserver/fontset.txt: Defined a 'DefaultFont' that is used as | |
4736 default font for Mapserver labels. | |
4737 | |
4738 * doc/conf/mapserver/db_layer.vm: Add a Mapserver LABELITEM if a value is | |
4739 provided by LayerInfo object. | |
4740 | |
4741 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added a | |
4742 getLabelItem() method that returns null as default. | |
4743 | |
4744 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override | |
4745 getLabelItem() to return "km" which is the database field that contains | |
4746 the kilometer information. | |
4747 | |
4748 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java, | |
4749 src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
4750 Added an attribute labelItem with appropriate getter/setter methods. | |
4751 | |
4752 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
4753 Splitted up the internal class Clazz. Now, there are two new inner | |
4754 classes Style and Label that fulfill the appropriate Mapfile sections of | |
4755 Mapserver. | |
4756 | |
4757 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Also Read font | |
4758 attributes and add new Clazz Label for the Mapserver layer. | |
4759 | |
4760 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Set the | |
4761 "labelItem" attribute on the LayerInfo object used to fill DB layer | |
4762 templates. | |
4763 | |
4764 2011-11-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4765 | |
4766 * doc/conf/meta-data.xml: Re-use macros to include more data to | |
4767 datacage in more situations. | |
4768 | |
4769 2011-11-11 Ingo Weinzierl <ingo@intevation.de> | |
4770 | |
4771 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4772 Removed needless imports. | |
4773 | |
4774 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
4775 | |
4776 * src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java: New | |
4777 WMSDBArtifact that creates facets for "fixpoints" relation. | |
4778 | |
4779 * doc/conf/artifacts/winfo.xml: Registered "floodmap.fixpoints" as valid | |
4780 "floodmap" facet. | |
4781 | |
4782 * doc/conf/conf.xml: Registered the new WMSFixpointsArtifact. | |
4783 | |
4784 * doc/conf/themes.xml: Added a theme for "floodmap.fixpoints". | |
4785 | |
4786 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4787 Facet type "floodmap.fixpoints". | |
4788 | |
4789 * doc/conf/meta-data.xml: Made "floodmap.fixpoints" available via datacage. | |
4790 | |
4791 * src/main/resources/messages.properties, | |
4792 src/main/resources/messages_de_DE.properties, | |
4793 src/main/resources/messages_en.properties, | |
4794 src/main/resources/messages_de.properties: Added titles for | |
4795 "floodmap.fixpoints" facets. | |
4796 | |
4797 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4798 | |
4799 * doc/conf/meta-data.xml: Refactored and (re)use macros. | |
4800 | |
4801 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
4802 | |
4803 * src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java: New | |
4804 WMSDBArtifact that creates facets for "buildings" relation. | |
4805 | |
4806 * doc/conf/artifacts/winfo.xml: Registered "floodmap.buildings" as valid | |
4807 "floodmap" facet. | |
4808 | |
4809 * doc/conf/conf.xml: Registered the new WMSBuildingsArtifact. | |
4810 | |
4811 * doc/conf/themes.xml: Added a theme for "floodmap.buildings". | |
4812 | |
4813 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4814 Facet type "floodmap.buildings". | |
4815 | |
4816 * doc/conf/meta-data.xml: Made "floodmap.buildings" available via datacage. | |
4817 | |
4818 * src/main/resources/messages.properties, | |
4819 src/main/resources/messages_de_DE.properties, | |
4820 src/main/resources/messages_en.properties, | |
4821 src/main/resources/messages_de.properties: Added titles for | |
4822 "floodmap.buildings" facets. | |
4823 | |
4824 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
4825 | |
4826 * src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java: New | |
4827 WMSDBArtifact that creates facets for "lines" relation. | |
4828 | |
4829 * doc/conf/artifacts/winfo.xml: Registered "floodmap.lines" as valid | |
4830 "floodmap" facet. | |
4831 | |
4832 * doc/conf/conf.xml: Registered the new WMSLineArtifact. | |
4833 | |
4834 * doc/conf/themes.xml: Added a theme for "floodmap.lines". | |
4835 | |
4836 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4837 Facet type "floodmap.lines". | |
4838 | |
4839 * doc/conf/meta-data.xml: Made "floodmap.lines" available via datacage. | |
4840 | |
4841 * src/main/resources/messages.properties, | |
4842 src/main/resources/messages_de_DE.properties, | |
4843 src/main/resources/messages_en.properties, | |
4844 src/main/resources/messages_de.properties: Added titles for facets. | |
4845 | |
4846 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4847 | |
4848 * doc/conf/meta-data.xml: Adjusted DC configuration to | |
4849 also allow heightmarks and base data in discharge longitudinal | |
4850 sections. Minor refac. | |
4851 | |
4852 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4853 | |
4854 * doc/conf/meta-data.xml: Adjusted DC configuration to let old | |
4855 calculations be available for discharge longitudinal sections. | |
4856 | |
4857 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4858 | |
4859 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
4860 Handle other WQKm and WKm Facets. | |
4861 | |
4862 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4863 | |
4864 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java | |
4865 (IS): New inner class with static method to allow queries whether | |
4866 a type belongs to a however-defined "group". | |
4867 | |
4868 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4869 | |
4870 * doc/conf/conf.xml: Reverted accidental commit. | |
4871 | |
4872 * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation | |
4873 for discharge longitudinal sections. | |
4874 | |
4875 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4876 | |
4877 * doc/conf/conf.xml: Reverted accidental commit. | |
4878 | |
4879 * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation | |
4880 for discharge longitudinal sections. | |
4881 | |
4882 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4883 | |
4884 Made discharge longitudinal section out compatible with annotations. | |
4885 | |
4886 * doc/conf/artifacts/winfo.xml: Added facets to compatibility list | |
4887 for discharge longitudinal section outs. | |
4888 | |
4889 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4890 | |
4891 Extracted Annotations-Macro in dc conf, recommend Annotations for | |
4892 discharge longitudinal sections. (Note correction two commits later). | |
4893 | |
4894 * doc/conf/conf.xml: Extracted annotations-macro, add recommendation | |
4895 for discharge longitudinal sections. | |
4896 | |
4897 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4898 | |
4899 Handle Annotations in DischargeLongitudinalSection diagrams. | |
4900 | |
4901 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
4902 Call doAnnotations for LONGITUDINAL_ANNOTATION facets. | |
4903 | |
4904 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4905 | |
4906 Resolve code duplicate. | |
4907 | |
4908 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java | |
4909 (doAnnotationsOut): Removed duplicate code. | |
4910 Theoretically handle WQKMS data. | |
4911 | |
4912 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
4913 Adjusted call to doAnnotationOut. | |
4914 | |
4915 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
4916 (doAnnotations): Doc from LongitudinalSectionGenerator. | |
4917 | |
4918 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4919 | |
4920 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
4921 Include exception when logging issue with spline creation. | |
4922 | |
4923 2011-11-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
4924 | |
4925 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
4926 When during XPath evaluation an exception is thrown, log the | |
4927 expression that caused the trouble. | |
4928 | |
4929 2011-11-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4930 | |
4931 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4932 Use separate XYDataset for each curve. This is needed because | |
4933 "Raum/Flaeche" needs specialized renderers, which are not compatible | |
4934 with the standard renderers. | |
4935 | |
4936 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
4937 Removed superfluous import. | |
4938 | |
4939 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
4940 | |
4941 * src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: New | |
4942 Artifact that is used to create WMS layers for floodplains in maps. | |
4943 | |
4944 * doc/conf/conf.xml: Registered the new WMSFloodplainArtifact. | |
4945 | |
4946 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4947 a new type 'floodmap.floodplain'. | |
4948 | |
4949 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.floodplain' facet | |
4950 for floodmaps. | |
4951 | |
4952 * doc/conf/themes.xml: Added a theme for 'floodmap.floodplain' facets. | |
4953 | |
4954 * doc/conf/meta-data.xml: Added configuration for 'floodplain'. | |
4955 | |
4956 * src/main/resources/messages.properties, | |
4957 src/main/resources/messages_de_DE.properties, | |
4958 src/main/resources/messages_en.properties, | |
4959 src/main/resources/messages_de.properties: Added facet titles for | |
4960 'floodmap.floodplain' facets. | |
4961 | |
4962 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
4963 | |
4964 * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java: New | |
4965 Artifact that is used to create WMS layers for catchments in maps. | |
4966 | |
4967 * doc/conf/conf.xml: Registered the new WMSCatchmentArtifact. | |
4968 | |
4969 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4970 a new type 'floodmap.catchment'. | |
4971 | |
4972 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.catchment' facet | |
4973 for floodmaps. | |
4974 | |
4975 * doc/conf/themes.xml: Added a theme for 'floodmap.catchment' facets. | |
4976 | |
4977 * doc/conf/meta-data.xml: Added configuration for 'catchments'. | |
4978 | |
4979 * src/main/resources/messages.properties, | |
4980 src/main/resources/messages_de_DE.properties, | |
4981 src/main/resources/messages_en.properties, | |
4982 src/main/resources/messages_de.properties: Added facet titles for | |
4983 'floodmap.catchment' facets. | |
4984 | |
4985 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
4986 | |
4987 * src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java: New | |
4988 Artifact that is used to create WMS layers for flood protected works. | |
4989 | |
4990 * doc/conf/conf.xml: Registered the new WMSHwsArtifact. | |
4991 | |
4992 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4993 a new type 'floodmap.hws'. | |
4994 | |
4995 * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.hws' facet for | |
4996 floodmaps. | |
4997 | |
4998 * doc/conf/themes.xml: Added a theme for 'floodmap.hws' facets. | |
4999 | |
5000 * doc/conf/meta-data.xml: Added configuration for 'hws'. | |
5001 | |
5002 * src/main/resources/messages.properties, | |
5003 src/main/resources/messages_de_DE.properties, | |
5004 src/main/resources/messages_en.properties, | |
5005 src/main/resources/messages_de.properties: Added facet titles for | |
5006 'floodmap.hws' facets. | |
5007 | |
5008 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5009 | |
5010 * doc/conf/mapserver/dbconnection.include: Removed. DB connections are | |
5011 supported by LayerInfo objects now. So, we do not need to configure it any | |
5012 more. | |
5013 | |
5014 * doc/conf/mapserver/db_layer.vm: The database connection is provided by | |
5015 LayerInfo objects. The "INCLUDE dbconnection.include" has been replaced. | |
5016 | |
5017 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: The inner | |
5018 State class got two new methods that provide information about db | |
5019 connection string and connection type. | |
5020 | |
5021 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java, | |
5022 src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Both | |
5023 classes support getter/setter for connection and connectionType. | |
5024 | |
5025 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Fill | |
5026 LayerInfo objects used to create DB layers with the connection and | |
5027 connection type provided by WMSDBLayerFacet. | |
5028 | |
5029 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5030 | |
5031 Allow height marks with points style in w-differences diagrams. | |
5032 | |
5033 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
5034 Handle HEIGHTMARKS_POINTS facets. | |
5035 | |
5036 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5037 | |
5038 Made Q Duration curve initially inactive. | |
5039 | |
5040 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
5041 (getInitialFacetActivity): Return 0 for DURATION_Q facets. Minor | |
5042 cosmetics. | |
5043 | |
5044 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5045 | |
5046 Recommend mainvalues for Duration Curve Diagrams. | |
5047 | |
5048 * doc/conf/meta-data.xml: Recommend mainvalues for duration curve | |
5049 diagrams. refactored into macro. | |
5050 | |
5051 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5052 | |
5053 Handle MainValue Facets in Duration Curve Diagrams. | |
5054 | |
5055 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5056 Handle MainValues. | |
5057 | |
5058 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5059 Adjusted to call doAnnotations. | |
5060 | |
5061 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5062 | |
5063 Move do*Annotation* (like mainvalue) in XYChartGenerator. | |
5064 | |
5065 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java | |
5066 (doAnnotations): New, moved from DischargeCurveGenerator. | |
5067 | |
5068 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java | |
5069 (doMainValueAnnotations): Moved to superclass. | |
5070 | |
5071 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5072 | |
5073 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
5074 Removed duplicate code. | |
5075 | |
5076 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5077 | |
5078 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
5079 (): Minor cosmetics, added stability. | |
5080 (getInitialFacetActivity): Let facets be inactive in duration curve | |
5081 diagrams. | |
5082 | |
5083 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5084 | |
5085 * doc/conf/artifacts/winfo.xml: Allow other.wqkms facets in many | |
5086 outputs, mainvalues in duration curves. | |
5087 | |
5088 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
5089 | |
5090 * doc/conf/mapserver/dbconnection.include: Adapted connection params for | |
5091 using an oracle database. | |
5092 | |
5093 * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, | |
5094 src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, | |
5095 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
5096 Added Oracle support for Mapserver's DATA attribute. Oracle doesn't allow | |
5097 a "USING UNIQUE id" string in this attribute which is required by Postgis. | |
5098 | |
5099 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
5100 Modified the geometry type of "talaue.shp" from MultiPolygon to Polygon. | |
5101 | |
5102 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
5103 which returns true, if the backend uses an Oracle db instance. Otherwise, | |
5104 it returns false. | |
5105 | |
5106 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5107 | |
5108 Fix flys/issue406 (Themestyle-editor: themes for "other.wkms" and | |
5109 "other.wqkms" missing) | |
5110 | |
5111 * doc/conf/themes.xml: Fixed typos in WKms and WQKms theme names. | |
5112 | |
5113 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5114 | |
5115 Fix flys/issue405 (Datacage: Recommendations get loaded twice). | |
5116 | |
5117 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java | |
5118 (setup): Do not try/catch exception. | |
5119 (spawn_state): Generate just one "general" output. | |
5120 | |
5121 2011-11-08 Ingo Weinzierl <ingo@intevation.de> | |
5122 | |
5123 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
5124 Added a log.warn() which prints out an exception - previously it was | |
5125 just skipped. | |
5126 | |
5127 2011-11-08 Ingo Weinzierl <ingo@intevation.de> | |
5128 | |
5129 * doc/conf/meta-data.xml: Removed orphaned datacage configuration which is | |
5130 no longer loadable. | |
5131 | |
5132 2011-11-07 Ingo Weinzierl <ingo@intevation.de> | |
5133 | |
5134 * doc/conf/conf.xml: Added an "post-describe" hook which is necessary to | |
5135 load recommendations for "floodmaps". | |
5136 | |
5137 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5138 | |
5139 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java | |
5140 (loadRows, loadColumns, loadQRanges): Refactored in preparation to | |
5141 ability to create WstValueTables for given wst_id and | |
5142 column_pos (interpolation for static data). | |
5143 | |
5144 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5145 | |
5146 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
5147 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
5148 Minor, picky cosmetics. | |
5149 | |
5150 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: | |
5151 Removed junk. | |
5152 | |
5153 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5154 Added documentation. | |
5155 | |
5156 2011-11-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5157 | |
5158 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5159 Be more specific in what to catch. | |
5160 | |
5161 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5162 | |
5163 * doc/conf/meta-data.xml: Added the CrossSectionTracks to the "floodmap" | |
5164 datacage configuration. | |
5165 | |
5166 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a | |
5167 FacetType "floodmap.qps". | |
5168 | |
5169 * doc/conf/conf.xml: Defined an ArtifactFactory for the "wmspqsartifact" | |
5170 string. The factory will create new instances of WMSQPSArtifact. | |
5171 | |
5172 * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java: New. This | |
5173 Artifact is used to create "floodmap.qps" facets. It has an internal fixed | |
5174 State WMSQPSState. | |
5175 | |
5176 * doc/conf/artifacts/winfo.xml: Added the "floodmap.qps" layer to the | |
5177 "floodmap" output. | |
5178 | |
5179 * doc/conf/themes.xml: Added a theme for "floodmap.qps" facets. | |
5180 | |
5181 * src/main/resources/messages.properties, | |
5182 src/main/resources/messages_de_DE.properties, | |
5183 src/main/resources/messages_en.properties, | |
5184 src/main/resources/messages_de.properties: Added strings for the QPS WMS | |
5185 layer used in floodmaps. | |
5186 | |
5187 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5188 | |
5189 Re-enable mainvalue-recommendations for computed discharge curves, | |
5190 as the NPE should be gone. | |
5191 | |
5192 * doc/conf/meta-data.xml: Uncomment mainvalue recommendations. | |
5193 | |
5194 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5195 | |
5196 When querying metadata/datacage, use only output-names of outputs that | |
5197 actually exists (in the sense of having facets). | |
5198 | |
5199 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
5200 Get output names from artifact, not from state. | |
5201 | |
5202 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5203 | |
5204 * doc/conf/meta-data.xml: Removed DEMs from floodmap configuration, | |
5205 because we are not able to draw DEMs into maps. | |
5206 | |
5207 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5208 | |
5209 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
5210 Subclasses WMSDBArtifact now and defines an inner class RiverAxisState | |
5211 which subclasses WMSDBState. | |
5212 | |
5213 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
5214 Removed. The RiverAxisState is an inner class of RiverAxisArtifact now | |
5215 which subclasses WMSDBState. | |
5216 | |
5217 * doc/conf/artifacts/riveraxis.xml: Removed, because the RiverAxisArtifact | |
5218 has a fixed static State only. | |
5219 | |
5220 * doc/conf/conf.xml: Removed riveraxis.xml definition. | |
5221 | |
5222 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5223 | |
5224 For a Flys-Collection, add outputt to attributes-part of describe | |
5225 document only if they contain facets. -> Prevent empty output nodes | |
5226 in flys-collections outputs. | |
5227 | |
5228 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
5229 (writeFacets): Added return type to indicate whether any facet was | |
5230 written. Decide whether to add an output-node depending on this | |
5231 return value. | |
5232 | |
5233 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
5234 | |
5235 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Create | |
5236 line and polygon layers for barriers only if they are really existing. | |
5237 | |
5238 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5239 | |
5240 Disable mainvalue-recommendations for discharge curves as they trigger | |
5241 a yet-to-be understood NPE. | |
5242 | |
5243 * doc/conf/meta-data.xml: Comment mainvalue-recommendations for | |
5244 discharge curves. | |
5245 | |
5246 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5247 | |
5248 Added new matching condition for theme-mappings: the name of | |
5249 the output. | |
5250 | |
5251 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
5252 Added output field and function to match it against a given | |
5253 output name. | |
5254 | |
5255 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5256 Createing ThemeMapping with output attribute from configuration. | |
5257 | |
5258 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
5259 (getTheme(FLYSContext, string)): Removed, never called. | |
5260 (getTheme): Added outputName argument, match it. | |
5261 | |
5262 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5263 Pass outputs name until it can be matched against mapping. | |
5264 | |
5265 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5266 | |
5267 * doc/conf/themes.xml: Added default themes for other.w(q)kms. | |
5268 | |
5269 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5270 | |
5271 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5272 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5273 Cosmetics, reduce logging noise. | |
5274 | |
5275 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5276 | |
5277 Added access to static W_Q_Kms - data in much the same way then static | |
5278 WKms. | |
5279 | |
5280 * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: | |
5281 Cache Key for static wqkms data. | |
5282 | |
5283 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: | |
5284 Facet for WQKms. | |
5285 | |
5286 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: | |
5287 Factory to access WQKms. | |
5288 | |
5289 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
5290 Artifact that provides 'static' WQKms. | |
5291 | |
5292 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5293 Added STATIC_WQKMS type. | |
5294 | |
5295 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5296 | |
5297 * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: | |
5298 New. Maps series to zero to be compatible with XYDifferenceRenderer. | |
5299 It returns an iterator over XYDatasets to enable splitting by NaNs, | |
5300 which still needs to be implemented. | |
5301 | |
5302 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5303 Uses a XYDatasetToZeroMapper now. Fixed package name. | |
5304 | |
5305 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5306 | |
5307 Added new matching options for theme-mappings to allow more | |
5308 overspecification of defaults (e.g. now name,description-pattern and | |
5309 master-artifacts attributes are matched). The first full match from | |
5310 the configuration file is done. | |
5311 New matching option in the masterAttr- field of a mapping are | |
5312 super-basic until new use-cases come up. | |
5313 Concrete new themes are point-styles of Ws when locations where chosen | |
5314 to calculate. | |
5315 | |
5316 * doc/conf/themes.xml: Added newly defined Themes. | |
5317 | |
5318 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5319 Put master-artifact in flys-context. | |
5320 | |
5321 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
5322 Accept masterAttr in constructor. | |
5323 (masterAttrMatches): New, check masterAttr-condition against | |
5324 artifact. | |
5325 | |
5326 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
5327 When creating ThemeMappings, pass in masterAttr. | |
5328 | |
5329 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
5330 (getTheme): Evaluate masterAttr-condition, always return first full | |
5331 match. | |
5332 | |
5333 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5334 | |
5335 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
5336 Added ARTIFACT key, documentation. | |
5337 | |
5338 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5339 | |
5340 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
5341 New. At the moment a pure copy of JFreeChart's XYDifferenceRenderer. | |
5342 Needs to be refactored to cope with its limitations: | |
5343 | |
5344 - Series numbers need to be zero based. We have more than two series | |
5345 in our diagrams. | |
5346 | |
5347 - Cannot handle definition holes indicated by NaNs. We have these | |
5348 cases e.g. more than one "Fliessbereich". | |
5349 | |
5350 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5351 | |
5352 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5353 Reenabled dumping data to disk. | |
5354 | |
5355 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5356 | |
5357 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5358 Removed superfluous import. | |
5359 | |
5360 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5361 | |
5362 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
5363 Use new pair in stack of results and connections because they are | |
5364 always used in pairs. Maintaining two separate stacks is not | |
5365 needed any longer. | |
5366 | |
5367 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5368 | |
5369 * src/main/java/de/intevation/flys/utils/Pair.java: New. A generic pair. | |
5370 | |
5371 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
5372 Rewritten to useful as test bed for "Raum/Flaeche" operations. | |
5373 | |
5374 2011-11-02 Ingo Weinzierl <ingo@intevation.de> | |
5375 | |
5376 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added | |
5377 setter methods for all parameters and removed the constructors. There is | |
5378 just an empty constructor - all parameters need to be set via setter | |
5379 methods. | |
5380 | |
5381 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified the | |
5382 creation of LayerInfo objects. | |
5383 | |
5384 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: | |
5385 Removed, because the internal structure and constructors of LayerInfo have | |
5386 changed, so that we gonna use LayerInfo for all layers now. | |
5387 | |
5388 * doc/conf/themes.xml: Modified the color definitions of | |
5389 'floodmap.riveraxis' and 'floodmap.kms' themes and added a 'symbol' field | |
5390 to 'floodmap.kms'. | |
5391 | |
5392 * doc/conf/mapserver/symbols.sym, | |
5393 doc/conf/mapserver/fontset.txt: New. Required by Mapserver. | |
5394 | |
5395 * doc/conf/mapserver/db_layer.vm: Added an 'EXTENT' field that is filled | |
5396 using LayerInfo.getExtent(). | |
5397 | |
5398 * doc/conf/mapserver/mapfile.vm: Modified FONTSET directory and added a | |
5399 SYMBOLSET. | |
5400 | |
5401 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added an | |
5402 abstract method getGeometryType(). | |
5403 | |
5404 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override | |
5405 getGeometryType() of WMSDBArtifact. This Artifact provides "POINT"s. | |
5406 | |
5407 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
5408 Create new WMSDBLayerFacets with geometry type "LINE". | |
5409 | |
5410 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
5411 Added a 'geometryType' attribute and getter/setter methods. This attribute | |
5412 determines the type of geometry provided by this database wms layer. Types | |
5413 could be "POLYGON", "POINT", "LINE" and so on. | |
5414 | |
5415 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5416 Added a 'symbol' attribute to the inner class Clazz. | |
5417 | |
5418 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a function to | |
5419 parse the symbol field of a theme. This symbol is used for | |
5420 MapserverStyle.Clazz. | |
5421 | |
5422 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5423 | |
5424 Apply point theme to heightmarks when imported in longitudinal | |
5425 section diagram. | |
5426 | |
5427 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5428 Added new FacetType HEIGHTMARK_POINTS. | |
5429 | |
5430 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
5431 Allow name to be given in constructor. | |
5432 | |
5433 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
5434 If heightmarks were loaded, give respective name in WKmsFacet | |
5435 generation. | |
5436 | |
5437 * doc/conf/themes.xml: Added virtual "Points" and concrete | |
5438 heightmark_points - theme. | |
5439 | |
5440 * doc/conf/artifacts/winfo.xml: Made longitudinal_section output | |
5441 compatible with heightmarks_points. | |
5442 | |
5443 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5444 Render heightmarks like other wkms. | |
5445 | |
5446 * doc/conf/meta-data.xml: Changed heightmark ids such that it can be | |
5447 identified in StaticWKmsFacet . | |
5448 | |
5449 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5450 | |
5451 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
5452 Documentation added. | |
5453 | |
5454 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5455 | |
5456 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
5457 Fix bug where (wrong) active-attribute was set, doc. | |
5458 | |
5459 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5460 | |
5461 Refactoring to allow mainvalues in both discharge and computed | |
5462 discharge curve diagrams. | |
5463 | |
5464 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java | |
5465 (addPointsQW): New helper function. | |
5466 | |
5467 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5468 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5469 Moved doMainValueQAnnotations, doMainValueWAnnotations from child- | |
5470 to parent-class, extracetd doDischargeOut. Use | |
5471 StyledSeriesBuilder.addPointsQW . | |
5472 | |
5473 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5474 | |
5475 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5476 Removed logger/debugging noise. | |
5477 | |
5478 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5479 | |
5480 1) Pass outputs name to artifacts getInitialFacetActivity(). | |
5481 2) Do not allow "gaps" in positions of facets in outputs in attributes | |
5482 of collection (prevent e.g. positions 1,3,5; will become 1,2,3 | |
5483 instead). | |
5484 | |
5485 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
5486 Pass outputname to artifacts getInitialFacetActivity(), prevent | |
5487 gaps in facets positions in outputs (1,3,10 become 1,2,3). | |
5488 | |
5489 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5490 | |
5491 1) Give Artifacts information about the out when they have to decide | |
5492 whether a given facet is initially in/active by adding parameter | |
5493 to getInitialFacetActivity(+outputName). | |
5494 2) Generate separate Set of MainValueFacets for discharge curves. | |
5495 | |
5496 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5497 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5498 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
5499 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
5500 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5501 (getInitialFacetActivity): Adjusted, new parameter outputName. | |
5502 Added MAINVALUES_{Q,W} definition. | |
5503 | |
5504 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
5505 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
5506 Accept name in constructor. | |
5507 | |
5508 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5509 Create second pair of MainValuesFacets, give distinguishable names. | |
5510 | |
5511 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5512 | |
5513 Added compatibility of (computed)discharge-curve diagrams with | |
5514 mainvalues. | |
5515 | |
5516 * doc/conf/artifacts/winfo.xml: Added mainvalues to compatibility list | |
5517 of (computed) discharge curve outputs. These facet-definitionss can | |
5518 differ in names because we can can have up to 4 mainvalue facets in | |
5519 one state. | |
5520 | |
5521 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
5522 | |
5523 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Determine | |
5524 the extent of such WMS layer based on the list of RiverAxisKm objects | |
5525 returned by the backend. | |
5526 | |
5527 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
5528 | |
5529 * doc/conf/meta-data.xml: Added a datacage node that represents a | |
5530 kilometer WMS layer. | |
5531 | |
5532 * doc/conf/conf.xml: Added a new Artifact WMSKmArtifact. | |
5533 | |
5534 * doc/conf/themes.xml: Added a style for 'floodmap.kms' facets. | |
5535 | |
5536 * doc/conf/artifacts/winfo.xml: Defined 'floodmap.kms' as valid floodmap | |
5537 facet. | |
5538 | |
5539 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
5540 a 'floodmap.kms' facet. | |
5541 | |
5542 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method to | |
5543 determine the srid of a river based on its name. | |
5544 | |
5545 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: New. This | |
5546 Artifact should act as base Artifact for WMS layers that represent data | |
5547 from database datastore. | |
5548 | |
5549 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: New. This | |
5550 Artifact is used to generate facets for kilometer WMS layers. | |
5551 | |
5552 * src/main/resources/messages.properties, | |
5553 src/main/resources/messages_de_DE.properties, | |
5554 src/main/resources/messages_en.properties, | |
5555 src/main/resources/messages_de.properties: Added default descriptions | |
5556 for 'floodmap.kms' facets. | |
5557 | |
5558 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5559 | |
5560 Fix incompilability. | |
5561 | |
5562 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
5563 Adjust to changed CrossSectionFacet. | |
5564 | |
5565 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5566 | |
5567 Minor preparations to handle multiple cross sections in one | |
5568 diagram/artifact, faking certain aspects (e.g. ability to display | |
5569 multiple cross sections, but let these fetch the exactly same data | |
5570 for now). | |
5571 | |
5572 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5573 Parameterize but fake access to cross-section (always take first | |
5574 one). | |
5575 (getCrossSectionName,getCrossSectionNames): Renamed, access names | |
5576 of all cross-sections, so that at least facets with different names | |
5577 are created (they will still deliver the same data). | |
5578 | |
5579 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
5580 Allow indexing. | |
5581 | |
5582 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
5583 Index created cross-sections. | |
5584 | |
5585 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5586 | |
5587 Show multiple water lines and facets in cross-section diagram if | |
5588 multiple waterlevel values had been entered. | |
5589 | |
5590 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
5591 (appendBackgroundActivity): Made static. | |
5592 (getWaterLines): Add 'idx' argument to specify index of queried | |
5593 waterlevel. | |
5594 | |
5595 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
5596 Add index. | |
5597 | |
5598 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
5599 Add one Facet for each of the computed waterlevels. | |
5600 | |
5601 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5602 | |
5603 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
5604 Added code to calculate intersection points. | |
5605 | |
5606 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5607 Added polygons for trivial cases. WIP | |
5608 | |
5609 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5610 | |
5611 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5612 Made it compilable again. | |
5613 | |
5614 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5615 | |
5616 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
5617 Made X() and Y() access macros public. | |
5618 | |
5619 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5620 More code. WIP. | |
5621 | |
5622 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5623 | |
5624 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5625 Handle start points when building polygons. Work in progress. | |
5626 | |
5627 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5628 | |
5629 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
5630 New. Vector operations on Point2D. | |
5631 | |
5632 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5633 Moved vector operations to VectorUtils. | |
5634 | |
5635 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5636 | |
5637 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
5638 Do not call size() in for loop again and again. | |
5639 | |
5640 2011-10-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5641 | |
5642 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
5643 Interim check in. Work in progress. | |
5644 | |
5645 2011-10-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5646 | |
5647 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: New. | |
5648 Polygon class to help creating "Raum/Flaeche" renderers with gaps in | |
5649 their definitions. WORK IN PROGRESS! | |
5650 | |
5651 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5652 | |
5653 * doc/conf/themes.xml: Added a default theme for the riveraxis used in the | |
5654 floodmap. | |
5655 | |
5656 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
5657 New. This class is used by ThemeUtil to create a style which is | |
5658 compatible for Mapserver- | |
5659 | |
5660 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a method to | |
5661 retrieve a Mapserver compatible style (as string) based on a given | |
5662 Document (that comes from CollectionItem's attribute). | |
5663 | |
5664 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: | |
5665 Implemented the setStyle() and getStyle() methods. | |
5666 | |
5667 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
5668 new parameter 'style' to createDatabaseLayer(). This parameter is set on | |
5669 LayerInfo. | |
5670 | |
5671 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create | |
5672 Mapserver compatible styles and call createDatabaseLayer() with this | |
5673 style. | |
5674 | |
5675 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5676 | |
5677 * doc/conf/artifacts/winfo.xml: Defined "floodmap.riveraxis" and | |
5678 "floodmap.wmsbackground" as compatible layers for the floodmap output. | |
5679 | |
5680 * doc/conf/mapserver/db_layer.vm: New. This layer template is used for | |
5681 Mapserver layers with database datastore. | |
5682 | |
5683 * doc/conf/mapserver/dbconnection.include: New. The database configuration | |
5684 used in the db_layer template. | |
5685 | |
5686 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
5687 getUserWMSUrl() that returns the URL to the user specific WMS server. | |
5688 This method requires a UUID of an Artifact to identify the owner of the | |
5689 Artifact. | |
5690 | |
5691 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Use | |
5692 FLYSUtils.getUserWMSUrl() to create the URL to the user WMS for | |
5693 WMSLayerFacets creation. | |
5694 | |
5695 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
5696 New. Subclasses WMSLayerFacet to save data and filter parameters used | |
5697 for database storage in Mapfiles. | |
5698 | |
5699 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: New. | |
5700 Subclasses LayerInfo to save database relevant parameters. | |
5701 | |
5702 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
5703 Creates new WMSDBLayerFacets, so that the riveraxis layer data is | |
5704 fetched from database. | |
5705 | |
5706 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
5707 public method that allows creating layers (type LINE) based on | |
5708 WMSDBLayerFacets. | |
5709 | |
5710 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Enabled | |
5711 support for Facets other than "floodmap.wsplgen" and "floodmap.barriers". | |
5712 Those other Facets are supposed to be WMSDBLayerFacets. | |
5713 | |
5714 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5715 | |
5716 Refactored, added StyledSeriesBuilder to unify adding points to | |
5717 XYSeries. | |
5718 | |
5719 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
5720 New class to help with adding points to XYSeries. | |
5721 | |
5722 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
5723 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
5724 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
5725 Use StyledSeriesBuilder to add points to series. | |
5726 | |
5727 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5728 | |
5729 Added DC-conf, such that static data can be loaded from w-difference | |
5730 diagrams datacage. | |
5731 | |
5732 * doc/conf/meta-data.xml: Minor "refactoring" (definition of two | |
5733 macros, allow certain static data to be loaded via datacage to | |
5734 w-difference diagrams, too. | |
5735 | |
5736 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5737 | |
5738 Load and display annotations in w-differences, minor polishing. | |
5739 | |
5740 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
5741 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5742 Use FacetType 'instead' of string. Allow Annotations in | |
5743 WDifferences- diagram. | |
5744 | |
5745 * doc/conf/meta-data.xml: Recommend annotations in w-differences case. | |
5746 | |
5747 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5748 | |
5749 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
5750 Survive case where a given output doesnt exist in compatibility | |
5751 matrix. | |
5752 | |
5753 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5754 | |
5755 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
5756 Added simpler constructor. | |
5757 | |
5758 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5759 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5760 Adjusted construction of StaticStates. | |
5761 | |
5762 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5763 | |
5764 * doc/conf/artifacts/winfo.xml: Allow Annotations in longitudinal and | |
5765 w-differences diagrams. | |
5766 | |
5767 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5768 | |
5769 Use artifacts configuration (e.g. winfo.xml) to define which facets | |
5770 can be used in which output. Hide no-matches. | |
5771 | |
5772 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
5773 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5774 Added use of "compatibility matrix". Only include facets in in | |
5775 collections description document that are marked compatible in the | |
5776 masterartifacts configuration (e.g. winfo.xml). | |
5777 | |
5778 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5779 | |
5780 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
5781 (mergeAttributes, getMasterArtifact): Extraced, updated caller. | |
5782 Cosmetics to reduce indentation one step. | |
5783 | |
5784 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5785 | |
5786 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java | |
5787 (getStateHistoryIds): New, return list of current and all previous | |
5788 state ids. | |
5789 | |
5790 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5791 | |
5792 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
5793 Trigger the re-creation of FLYS mapfile if endOfLife() of this state is | |
5794 called. | |
5795 | |
5796 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5797 | |
5798 * doc/conf/mapserver/mapfile.vm: The "layers" injected by VelocityEngine is | |
5799 now used to include layers. A single string in this list represents the | |
5800 path to a file which contains a LAYER section for Mapserver' Mapfile. | |
5801 | |
5802 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Removed the | |
5803 update() call of MapfileGenerator. Mapfiles are generated by MapGenerator | |
5804 only which requires a FLYSArtifactCollection.doOut()! | |
5805 | |
5806 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Call update() | |
5807 of MapfileGenerator to trigger the re-creation of mapfile(s). | |
5808 | |
5809 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Collect all | |
5810 LAYER snippets from filesystem and inject the filepath for each snippet | |
5811 into the Mapfile template. | |
5812 | |
5813 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5814 | |
5815 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
5816 src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java, | |
5817 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5818 Cosmetics, doc. | |
5819 | |
5820 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5821 | |
5822 Let OutputParser and AttributeParser collect all facets on the way. | |
5823 | |
5824 * src/main/java/de/intevation/flys/collections/OutputParser.java, | |
5825 src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
5826 Collect all facets while iterating over Outputs and Attributes, | |
5827 documentation added. | |
5828 | |
5829 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5830 | |
5831 Extracted getFlysContext from FLYSArtifacts into FLYSUtils. | |
5832 | |
5833 * src/main/java/de/intevation/flys/utils/FLYSUtils.java | |
5834 (getFlysContext): Added, extracted from FLYSArtifact. | |
5835 | |
5836 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5837 (getFlysContext): Moved to FLYSUtils, updated callers. | |
5838 | |
5839 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
5840 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5841 Update callers to getFlysContext. | |
5842 | |
5843 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5844 | |
5845 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: | |
5846 Catch IOException - flys-artifacts compiles again. | |
5847 | |
5848 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5849 | |
5850 * doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet | |
5851 for floodmaps. | |
5852 | |
5853 * doc/conf/mapserver/shapefile_layer.vm: New. Currently a copy of | |
5854 layer.vm. This template will evolve to a special mapserver layer | |
5855 template with a shapefile data source. | |
5856 | |
5857 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Fixed broken | |
5858 facet name of barriers. | |
5859 | |
5860 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added | |
5861 public methods for creating wsplgen and barriers layer files for | |
5862 mapserver. | |
5863 | |
5864 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Use | |
5865 MapfileGenerator to create new layer files for wsplgen and barriers. | |
5866 | |
5867 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
5868 | |
5869 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new | |
5870 method gerRiverBoundary() which returns an Envelope object (which | |
5871 represents the bounding box of a Geometry) of a riveraxis specified by its | |
5872 rivername. | |
5873 | |
5874 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: Use | |
5875 Geometry.getRiverBoundary() to determine the max extent of a river. | |
5876 | |
5877 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, | |
5878 src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Use | |
5879 JTS Envelope to save the bounding boxes of WMS layers. | |
5880 | |
5881 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
5882 Adapted the code to apply the changes in GeometryUtils (use Envelope to | |
5883 determine the max extent of the river axis). | |
5884 | |
5885 * src/main/java/de/intevation/flys/exports/MapGenerator.java: New (work in | |
5886 progress). This Generator will currently return a map configuration in XML | |
5887 which consists of parameters required by OpenLayers to create a map. | |
5888 | |
5889 * doc/conf/conf.xml: Registered the new MapGenerator. | |
5890 | |
5891 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5892 | |
5893 * doc/conf/meta-data.xml: Do not recommend historical data to load | |
5894 when having computational discharge curves. | |
5895 | |
5896 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5897 | |
5898 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5899 Reduce noise, given "error" message was more of "debug" nature. | |
5900 | |
5901 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5902 | |
5903 Restore mapping of state id to facets (essentially revert, revision | |
5904 3083 and 3088). | |
5905 | |
5906 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5907 (getInitialFacetActivity): Be more explicit on which facets to | |
5908 introduce inactivated. | |
5909 | |
5910 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5911 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
5912 Minor refactoring, declare a string final static. | |
5913 | |
5914 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5915 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
5916 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5917 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
5918 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
5919 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
5920 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
5921 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
5922 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5923 Restore association from state id to facets. | |
5924 | |
5925 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5926 | |
5927 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
5928 src/main/java/de/intevation/flys/collections/OutputParser.java: | |
5929 Cosmetics, documentation. | |
5930 | |
5931 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5932 | |
5933 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5934 Prepare rendering of "other/static wkms" (functional) and | |
5935 w-differences (not yet fully functional). | |
5936 | |
5937 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5938 | |
5939 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
5940 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5941 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
5942 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
5943 Cosmetics. | |
5944 | |
5945 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5946 | |
5947 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
5948 Do not store facets in a map from stateId to list of facets, but in | |
5949 a pure list instead. | |
5950 | |
5951 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5952 | |
5953 * doc/conf/artifacts/winfo.xml: Adjusted to newer semantics, | |
5954 minor cleanups. | |
5955 | |
5956 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5957 | |
5958 Resolve association of facets to states in artifacts. This eases | |
5959 merging of outputs and facets and inhibition of unwanted outputs | |
5960 substiantially (at the price of slightly more expensive merging). | |
5961 Also, the semantics of artifacts configuration files (e.g. winfo.xml) | |
5962 is changed (facet elements within an output elements are used for | |
5963 merging). | |
5964 | |
5965 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5966 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
5967 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
5968 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
5969 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
5970 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
5971 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
5972 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5973 Do not store facets in a map from stateId to list of facets, but in | |
5974 a pure list instead. | |
5975 | |
5976 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5977 | |
5978 * doc/conf/meta-data.xml: Added dc configuration for some data | |
5979 that can be loaded from longitudinal section diagrams. | |
5980 | |
5981 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5982 | |
5983 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5984 Cosmetics, docs. | |
5985 | |
5986 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5987 | |
5988 Let Qs in Longitudinal Diagram be inactive, initally. | |
5989 | |
5990 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5991 (getInitialFacetActivity): Do not let Facets ending with a 'q' | |
5992 enter in active state. | |
5993 | |
5994 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5995 | |
5996 * doc/conf/meta-data.xml: Fix broken datacage config. | |
5997 | |
5998 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
5999 | |
6000 * doc/conf/meta-data.xml: Configured to include correct id to | |
6001 clone artifact that produces w-diff. | |
6002 | |
6003 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6004 | |
6005 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6006 Revert correct behaviour of Annotations (the small axis tick shall | |
6007 always be drawn). Minor refactoring. | |
6008 | |
6009 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6010 | |
6011 * doc/conf/meta-data.xml: Added configuration to include differences | |
6012 in datacage when longitudinal sections are shown (yet not | |
6013 functional). | |
6014 | |
6015 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6016 | |
6017 * doc/conf/meta-data.xml: Cosmetics. | |
6018 | |
6019 2011-10-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6020 | |
6021 * doc/conf/themes.xml: Added theme for w_differences facets. | |
6022 | |
6023 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java | |
6024 (createSecondAxisRange): Survive parameter-nullness for now. | |
6025 Added documentation. | |
6026 | |
6027 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6028 | |
6029 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
6030 New. Caching wrapper around an XML document theme. It uses ThemeUtil | |
6031 to access the values and stores them in instance variable. | |
6032 Background: ThemeUtil use XPath a lot which is expensive. | |
6033 | |
6034 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java, | |
6035 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6036 Use ThemeAccess to style the annotations. | |
6037 | |
6038 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6039 Removed some XPath strings. They are in ThemeUtil. | |
6040 | |
6041 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6042 | |
6043 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6044 Added methods to parse further attributes. | |
6045 | |
6046 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6047 Apply the theme attributes and use ThemeUtils to get the attribute values. | |
6048 | |
6049 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6050 Removed the spamy debug output. | |
6051 | |
6052 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6053 | |
6054 To obtain the size of a diagram it is rendered twice. The | |
6055 second time the generated image is omitted so the concrete | |
6056 rendered image is not needed. To save CPU cycles in this pass | |
6057 the image is rendered to to /dev/null Graphics2D object. | |
6058 | |
6059 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
6060 Added boolean system property "info.rendering.nop.graphics" (default: false). | |
6061 With this property set the info rendering is done via a new | |
6062 NOPGraphics2D opbject which does not render the image. | |
6063 | |
6064 * src/main/java/de/intevation/flys/java2d/NOPGraphics2D.java: | |
6065 New. Implements java.awt.Graphics2D trivial empty methods. | |
6066 This prevents rendering. | |
6067 | |
6068 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6069 Commented out spamy debug output | |
6070 | |
6071 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6072 | |
6073 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6074 Draw the text background and use orientation attribute. | |
6075 | |
6076 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
6077 | |
6078 * doc/conf/themes.xml: | |
6079 Renamed 'textbackground' to 'backgroundcolor' to have 'color' in the | |
6080 attribute name. | |
6081 | |
6082 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6083 Process text attributes correctly. | |
6084 | |
6085 2011-10-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6086 | |
6087 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
6088 New. Service to lookup the Nth nearest neighbors for a set of given | |
6089 cross section ids and kms. | |
6090 | |
6091 * doc/conf/conf.xml: Registered service. | |
6092 | |
6093 * doc/conf/cache.xml: Cache config. | |
6094 | |
6095 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
6096 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6097 Removed superfluous imports. | |
6098 | |
6099 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
6100 | |
6101 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6102 Added methods to extract further attributes from theme. | |
6103 | |
6104 2011-10-20 Ingo Weinzierl <ingo@intevation.de> | |
6105 | |
6106 * doc/conf/themes.xml: Added main value themes for longitudinal section | |
6107 charts. | |
6108 | |
6109 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: New. This | |
6110 class stores the name of a facet, the related theme and a pattern | |
6111 string. | |
6112 | |
6113 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
6114 Read the pattern string and store a list of ThemeMapping objects in the | |
6115 FLYSContext. | |
6116 | |
6117 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Modified | |
6118 getTheme() which now takes the FLYSContext, the name of a facet and an | |
6119 optional pattern string. Now, we can have specialized Themes for each | |
6120 chart type. E.g. the facet "longitudinal_section.w" maps the default | |
6121 Theme for W lines in longitudinal section charts. If the optional | |
6122 pattern string matches the pattern ".*(HQ1000)(\D.*)*", the ThemeFactory | |
6123 will return the Theme "LongitudinalSectionW_HQ1000". | |
6124 | |
6125 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6126 Use the description of a facet as pattern string to get the relevant | |
6127 Theme from ThemeFactory. | |
6128 | |
6129 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
6130 | |
6131 * doc/conf/themes.xml: | |
6132 Added new theme attributes. | |
6133 | |
6134 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6135 | |
6136 Fix WDifference plots where masterartifact has no range set. | |
6137 | |
6138 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6139 (addSubtitles): Overridden, the master artifact has no | |
6140 range. | |
6141 | |
6142 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6143 | |
6144 Fix masterartifact in collections in cases where the original | |
6145 masterartifacts facets do not come first in certain list. Query | |
6146 'backend'/db instead. | |
6147 | |
6148 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6149 Set 'real' master artifact, defined to be oldest belonging to this | |
6150 collection. | |
6151 | |
6152 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6153 | |
6154 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
6155 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
6156 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
6157 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6158 Modified the method signature of createStaticData() which now also | |
6159 requires a FLYSArtifact. | |
6160 | |
6161 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
6162 Override createStaticData() to create titles for Qs manually - we want | |
6163 to display the named main values if existing for the selected Qs. | |
6164 | |
6165 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
6166 | |
6167 * doc/conf/themes.xml: | |
6168 ComputedDischargeCurveW and ComputedDischargeCurveQ inherit attributes from | |
6169 theme 'Text'. | |
6170 | |
6171 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6172 | |
6173 Fix for flys/issue316 | |
6174 | |
6175 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added | |
6176 constructor to not sort the data. | |
6177 | |
6178 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
6179 Use the not sorting constructor of StyledXYSeries. | |
6180 | |
6181 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6182 | |
6183 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6184 moved the code to create WSP W and Q facet names to FLYSUtils. | |
6185 | |
6186 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New functions for | |
6187 creating WSP W and Q facet names and for querying a named main value | |
6188 based on a given gauge and value. The names of W and Q facets will now | |
6189 depend on the selected Q and Q mode: if the mode is "q at gauge" and a | |
6190 named value is found for the given value, the facet's name contains the | |
6191 named value instead of the value itself. | |
6192 | |
6193 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6194 | |
6195 Fix datacage configuration to let client load ZUS and flood | |
6196 protections. | |
6197 | |
6198 * doc/conf/meta-data.xml: Use 'ids' instead of 'id' to help client. | |
6199 | |
6200 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
6201 | |
6202 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6203 Added methods to parse text attributes from theme document. | |
6204 | |
6205 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
6206 src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6207 Apply a theme to axis annotations. | |
6208 | |
6209 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6210 | |
6211 Create (data) Label from data string (client will be adjusted to send | |
6212 the name). | |
6213 | |
6214 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6215 Create label from input data string, documentation added, junk | |
6216 removed. | |
6217 | |
6218 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6219 | |
6220 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java(zoom): | |
6221 Do not crash if no axis is given. | |
6222 | |
6223 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
6224 | |
6225 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added | |
6226 getFormat() which extracts the format string from XML request document. | |
6227 | |
6228 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: Adapted | |
6229 method signatures of exportImage(), exportSVG() and exportPDF(). All | |
6230 methods now take a CallContext object which stores extra chart export | |
6231 parameters. | |
6232 | |
6233 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6234 Enabled PDF and SVG chart exports based on the "format" string given in | |
6235 the XML request document. | |
6236 | |
6237 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6238 | |
6239 Simplify rendereing W(Q)Kms in WDifferencesCurveGenerator. | |
6240 | |
6241 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6242 (doWOut, doWOut): Simplified. | |
6243 | |
6244 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6245 | |
6246 Render zus and flood-protections in WDifferences-diagrams. | |
6247 | |
6248 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6249 Added basic respect of "other.wkms"- facets. | |
6250 | |
6251 | |
6252 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6253 | |
6254 Adjusted Datacage-Configuration to fetch "extra longitudinal...." | |
6255 (.zus) - waterlevels in certain case (in system-part). | |
6256 | |
6257 * doc/conf/meta-data.xml: Adjusted to present extra-kms with | |
6258 staticwkms factory in certain case. | |
6259 | |
6260 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
6261 | |
6262 * doc/conf/themes.xml: | |
6263 Added new virtual theme for text with the attributes 'font', 'textcolor' | |
6264 and 'textsize'. | |
6265 | |
6266 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6267 | |
6268 Give StaticWKmsArtifacts proper names, and pre-deselect them. | |
6269 | |
6270 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6271 (getInitialFacetActivity): Overridden to let facets enter plot | |
6272 inactively. | |
6273 (setup): Give Facets the name of the Wst. | |
6274 | |
6275 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6276 Refactored to expose getWKmsName separately. | |
6277 | |
6278 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6279 | |
6280 Adjusted Datacage-Configuration to fetch flood-protections when | |
6281 waterlevels are requested (in system-part). | |
6282 | |
6283 * doc/conf/meta-data.xml: Adjusted to present flood-protections with | |
6284 staticwkms factory in certain case. | |
6285 | |
6286 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6287 | |
6288 Register staticwkms factory. | |
6289 | |
6290 * doc/conf/conf.xml: Register staticwkms factory to spawn StaticWKms- | |
6291 Artifacts. | |
6292 | |
6293 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6294 | |
6295 Fetch name of static WKms. | |
6296 | |
6297 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6298 Removed dependence on "kind", but fetch name for created WKms. | |
6299 | |
6300 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6301 Remove dependence on Kind. | |
6302 | |
6303 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6304 | |
6305 Store parameterization in data, not in Artifact. | |
6306 | |
6307 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6308 Resolve col_pos and wst_id field, use data instead. | |
6309 | |
6310 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6311 | |
6312 Add convenience-method to add defaultdata (string). | |
6313 | |
6314 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6315 (addStringData): Add Default (String) Data . | |
6316 | |
6317 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6318 | |
6319 Add a new Artifact and Facet (StaticWKmsArtifact, WKmsFacet) to | |
6320 access WKms obtainable with the WKmsFactory. | |
6321 | |
6322 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
6323 New, artifact with single state to get WKms from WKmsFactory. | |
6324 | |
6325 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
6326 New Facet to display W over km. | |
6327 | |
6328 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
6329 Added new type name. | |
6330 | |
6331 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6332 | |
6333 Add WKMsFactory to access 'static' wst-data. | |
6334 | |
6335 * src/main/java/de/intevation/flys/artifacts/model/StaticWKmsCacheKey.java: | |
6336 Cache Key for the static WKms data. | |
6337 | |
6338 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
6339 New, creates WKms from wst-id and column. Does not yet fetch the | |
6340 name. | |
6341 | |
6342 * doc/conf/cache.xml: Added cache configuration for static wkms data. | |
6343 | |
6344 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6345 | |
6346 Cosmetics, docs. | |
6347 | |
6348 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
6349 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
6350 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
6351 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6352 src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
6353 Cosmetics, docs. | |
6354 | |
6355 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6356 | |
6357 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
6358 Added constructor that takes name, docs. | |
6359 | |
6360 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6361 | |
6362 Fix issue that Annotations do not come with theme/style. | |
6363 | |
6364 * doc/conf/themes.xml: Added "Annotations" default style. | |
6365 | |
6366 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6367 Set style of annotations, minor cosmetics. | |
6368 | |
6369 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6370 | |
6371 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6372 Made inner class ThemeList static. | |
6373 s/new Integer(small)/Integer.valueOf(small)/ | |
6374 | |
6375 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6376 | |
6377 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6378 The inner class ThemeList makes now use of ManagedDomFacet to read the | |
6379 attributes of Facets saved in the Collection's attribute. | |
6380 | |
6381 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6382 | |
6383 flys/issue314: Variables in datacage are now case insensitive. | |
6384 (H2 returns meta data variables uppercase) | |
6385 | |
6386 * doc/conf/meta-data.xml: | |
6387 Made a statement more precise. Added some debug output. | |
6388 | |
6389 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
6390 Use uppercase variable names. | |
6391 | |
6392 * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, | |
6393 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
6394 src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, | |
6395 src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
6396 Variables are now treated as uppercase. | |
6397 | |
6398 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
6399 Input variables are now treated uppercase. | |
6400 | |
6401 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6402 | |
6403 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
6404 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
6405 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
6406 Prepared Facets to support a "visible" attribute. | |
6407 | |
6408 * src/main/java/de/intevation/flys/collections/OutputParser.java: Adapted | |
6409 the constructor call of ManagedFacetAdapter. | |
6410 | |
6411 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6412 The inner class ThemeList now supports the "visible" attribute of | |
6413 ManagedFacets. | |
6414 | |
6415 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
6416 | |
6417 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
6418 Added method to apply line type. | |
6419 | |
6420 * doc/conf/themes.xml: | |
6421 Changed initial default value for line type. | |
6422 | |
6423 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6424 | |
6425 flys/issue226 (W-INFO: Dauerlinienberechung /Abbbildung x-Achse) | |
6426 | |
6427 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
6428 Set the upper bound of these charts to 364. | |
6429 | |
6430 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
6431 | |
6432 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
6433 Added a function that returns a Gauge based on its name. | |
6434 | |
6435 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
6436 Create proper descriptions for facets. | |
6437 | |
6438 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Added a | |
6439 setter for labels. | |
6440 | |
6441 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
6442 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
6443 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6444 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6445 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
6446 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6447 Use the string returned by Facet.getDescription() as series names. The | |
6448 ThemePanel and the Legend will always display the same titles for curves | |
6449 now. | |
6450 | |
6451 | |
6452 2011-10-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6453 | |
6454 Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). | |
6455 | |
6456 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
6457 (parseLineWidth): New. Get line width from Document. | |
6458 | |
6459 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6460 When adding annotations, parse line width from theme, set it. | |
6461 | |
6462 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
6463 When painting, set Paint and stroke early enough. | |
6464 | |
6465 2011-10-14 Ingo Weinzierl <ingo@intevation.de> | |
6466 | |
6467 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Put the | |
6468 config directory into the Velocity context. It is available as | |
6469 '$CONFIGDIR' in templates. | |
6470 | |
6471 * doc/conf/mapserver/mapfile.vm: Set the debug file to | |
6472 "$CONFIGDIR/flys-user-wms.log" and added a LEGEND section. | |
6473 | |
6474 * doc/conf/mapserver/wsplgen_class.vm: Adapted the class names. Those | |
6475 names are displayed in the image served by GetLegendGraphic. | |
6476 | |
6477 2011-10-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6478 | |
6479 Add possibility of programmatic configuration of initial "activity" | |
6480 state (active or inactive) of (Managed)Facets by introducing | |
6481 FLYSArtifact.getInitialFacetActivity. This method shall be overriden | |
6482 by subclasses where Facets are wanted to come to live inactive. | |
6483 Artifacts will be asked only once how the MangedFacet should come to live, | |
6484 namely when AttributeWriter finds a genuinely new Facet. | |
6485 | |
6486 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
6487 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java | |
6488 (getInitialFacetActivity): | |
6489 New function to let Artifact decide whether a ManagedFacet shall | |
6490 initially be set to active or inactive. | |
6491 | |
6492 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
6493 Accept database in constructor. For genuinely new Facets, spawn its | |
6494 mother artifact and ask whether the (Managed)Facet shall be active | |
6495 or inactive (initially). | |
6496 | |
6497 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
6498 (buildOutAttributes): Pass database to AttributeWrite (which needs it | |
6499 to spawn artifacts), rename items parameter to reflect content. | |
6500 | |
6501 2011-10-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6502 | |
6503 Cosmetics, removed obsolete imports. | |
6504 | |
6505 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
6506 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6507 Removed obsolete imports. | |
6508 | |
6509 2011-10-12 Ingo Weinzierl <ingo@intevation.de> | |
6510 | |
6511 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
6512 Added a further attribute "mark.selected" to the barriers feature type. | |
6513 This attribute is used in the client, where we are not able to remove it | |
6514 properly. Reading the GeoJSON string without this attribute is no longer | |
6515 possible... strange! | |
6516 | |
6517 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6518 | |
6519 Added i18n for label of wdiff "pair select" states data. | |
6520 | |
6521 * src/main/resources/messages.properties, | |
6522 src/main/resources/messages_de_DE.properties, | |
6523 src/main/resources/messages_en.properties, | |
6524 src/main/resources/messages_de.properties: Added i18n for | |
6525 state.winfo.waterlevel_pair_select . | |
6526 | |
6527 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6528 | |
6529 Addressed "Wrong labels" [6] part of flys/issue371 (W-INFO / Differenzen: | |
6530 Anmerkungen zur Umsetzung) . | |
6531 | |
6532 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
6533 Adjusted variable names to avoid conflict in subclasses, adjusted | |
6534 default value for i18n string. | |
6535 | |
6536 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6537 | |
6538 Cosmetics, docs. | |
6539 | |
6540 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6541 Cosmetics: Space after full stop in commments, slightly improved | |
6542 documentation, added one debug message. | |
6543 | |
6544 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6545 | |
6546 Fix remainder of flys/issue304 (Erweiterte Funktionen W-Differenzen) . | |
6547 | |
6548 * doc/conf/artifacts/winfo.xml: Removed obsolete data of | |
6549 WDifferencesState. | |
6550 | |
6551 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
6552 Re-enable facet-filtering, but adjust filters before that happens | |
6553 (former longitudinal_section output is now w_differences output). | |
6554 | |
6555 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6556 | |
6557 Added wdiff-chart translations. | |
6558 | |
6559 * src/main/resources/messages.properties, | |
6560 src/main/resources/messages_de_DE.properties, | |
6561 src/main/resources/messages_en.properties, | |
6562 src/main/resources/messages_de.properties: Added i18n for wdiff. | |
6563 | |
6564 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6565 | |
6566 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6567 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6568 Expose translateable Strings as constants. | |
6569 | |
6570 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6571 | |
6572 Fix most labels in w-differences charts. | |
6573 | |
6574 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6575 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6576 Remove most static final i18n-variables in favor of direct String | |
6577 usage or usage of methods. By this, allow easier adoption of labels | |
6578 in subclasses. | |
6579 | |
6580 2011-10-11 Ingo Weinzierl <ingo@intevation.de> | |
6581 | |
6582 flys/issue383 (Zweite Y-Achse wird beim Zoomen/Verschieben nicht angepasst.) | |
6583 | |
6584 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6585 Call adjustAxes() before applying zoom settings with autoZoom(). We need | |
6586 to add new y-axes first before we adjust their ranges. | |
6587 | |
6588 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6589 | |
6590 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6591 s/new Integer(small)/Integer.valueOf(small)/ | |
6592 | |
6593 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6594 | |
6595 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
6596 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6597 Do not fire change events for each and every data point added. | |
6598 | |
6599 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6600 | |
6601 Fix WDifferences with more than one Pair (crashed due to incorrect index for | |
6602 facets.) | |
6603 | |
6604 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
6605 Fix wrong index for difference facets (allows for more than one | |
6606 difference facet per artifact without crashes). | |
6607 | |
6608 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6609 | |
6610 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6611 Use slightly modified doWOut-implementation from | |
6612 LongitudinalSectionGenerator (here need to add Ws to different axis). | |
6613 | |
6614 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6615 | |
6616 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6617 Fix import/reference. | |
6618 | |
6619 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6620 | |
6621 Let WaterlevelPairSelectState include diffids-data (if any) to enable | |
6622 future work on repopulation of Grid in GUI when jumping back | |
6623 (reparameterization). | |
6624 | |
6625 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6626 (createItems): Override to include old data. | |
6627 | |
6628 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
6629 | |
6630 flys/issue150 (Diagramm: Anzeige von W bergauf) | |
6631 flys/issue345 (W-INFO / Wasserspiegellagenberechnung, Diagrammausgabe) | |
6632 | |
6633 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6634 Corrected the determination to invert the x axis, so that waterlines | |
6635 will start with their highest value at the left and end with their | |
6636 lowest values at the right. | |
6637 | |
6638 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6639 | |
6640 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
6641 Cosmetics, added an (@Override) annotation. | |
6642 | |
6643 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java, | |
6644 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
6645 Cosmetics, added documentation. | |
6646 | |
6647 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
6648 Cosmetics, whitespace after full stops in comments, added | |
6649 (@Override) annotation. | |
6650 | |
6651 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
6652 | |
6653 flys/issue220 (Diagramm: Achsenbeschriftungen an verschiedenen Achsen müssen gleich aussehen) | |
6654 | |
6655 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
6656 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6657 Adjusted the label font of the 2nd y-axis - now, both axes labels look | |
6658 equal. | |
6659 | |
6660 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
6661 | |
6662 flys/issue189 (WINFO/Dauerlinie: Sortierung der Berechnungsausgabe nach Dauerzahlen aufsteigend) | |
6663 | |
6664 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: Added a | |
6665 method that determines if the items (days) in this object are increasing | |
6666 or not. | |
6667 | |
6668 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
6669 Changed the order of the CSV export - the highest day is at the top of | |
6670 the export; the lowest day is at the bottom. | |
6671 | |
6672 2011-10-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6673 | |
6674 Worked on flys/issue150 (Diagramm: Anzeige von W bergauf). | |
6675 Still does not work in all cases. | |
6676 | |
6677 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java (generateChart()): | |
6678 Reordered calls to ensure that the inversion of the x axis is | |
6679 not eliminated by other chart generation steps as a side effect. | |
6680 | |
6681 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6682 Assuming that JFreeChart is inverting axis automatically if the | |
6683 KMs are reversed ordered only do invert only in some situations. | |
6684 | |
6685 Do not invert axis for Q (@Ingo: This is wrong! We must do this | |
6686 if we are only displaying the Qs and the Ws are deactived). | |
6687 | |
6688 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
6689 | |
6690 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6691 Take care on empty ranges while preparing ranges for single points. | |
6692 | |
6693 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
6694 | |
6695 flys/issue114 (W-INFO: Wasserspiegellagenberechnung / Ort (Spezialfall: Generierung eines Diagramms bei punkthafter Berechnung)) | |
6696 | |
6697 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Expand | |
6698 ranges for x and y axes if there is just a single point in a series - | |
6699 JFreeChart requires a range where lower <> upper. | |
6700 | |
6701 2011-10-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6702 | |
6703 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
6704 src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java, | |
6705 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
6706 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6707 Add whitespace after full stop in comments, minor doc improvements. | |
6708 | |
6709 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
6710 | |
6711 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
6712 | |
6713 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6714 Adapted the process of collecting outs for Artifacts/Facets. We will now | |
6715 call OutGenerator.doOut() for each Artifact and Facet - never mind if | |
6716 the facet is activated (visible) or not. The OutGenerator should decide | |
6717 on its own whtat to do with facets which are "marked" as _not_ visible. | |
6718 | |
6719 * src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
6720 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
6721 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6722 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
6723 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
6724 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
6725 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6726 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
6727 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
6728 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
6729 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
6730 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
6731 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
6732 Adapted the signature of OutGenerator.doOut(). There will be a new | |
6733 boolean parameter "visible" that determines if the facet specified in | |
6734 this method is visible for this output or not. | |
6735 | |
6736 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Now, | |
6737 that we walk over every Artifact/Facet, we are able to collect min/max | |
6738 data for all axes. We store these information and use them to set the | |
6739 ranges of x and y axes. The result of this: a chart can have proper axes | |
6740 set without any data in it. | |
6741 | |
6742 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Use | |
6743 min/max ranges stored while calling doOut() for each Artifact/Facet | |
6744 instead of fetching those information from chart's Datasets (which could | |
6745 be null). | |
6746 | |
6747 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
6748 | |
6749 * src/main/java/de/intevation/flys/utils/Formatter.java: Changed the max | |
6750 number of digits for AT exports from 0 to 2. | |
6751 | |
6752 2011-10-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6753 | |
6754 * src/main/java/de/intevation/flys/exports/ATWriter.java: Get rid | |
6755 of buggy first line code. | |
6756 | |
6757 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6758 | |
6759 fixed flys/issue201 | |
6760 | |
6761 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6762 Replace >= with > in km index lookup because last km was not found. | |
6763 | |
6764 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6765 | |
6766 fixed flys/issue177 | |
6767 | |
6768 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
6769 Revert rev2245. Code works fine now! :-) | |
6770 | |
6771 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
6772 | |
6773 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Stores a | |
6774 list of XYTextAnnotations instead of FLYS specific Annotations. This | |
6775 makes this class suitable for other annotation types as well. | |
6776 | |
6777 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
6778 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
6779 Both facets' getData() will now return an instance of FLYSAnnotation. | |
6780 | |
6781 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
6782 Create XYTextAnnotations used to instantiate an object of | |
6783 FLYSAnnotation. | |
6784 | |
6785 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
6786 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6787 Removed the code to add annotations to the plot. This task is general | |
6788 enough to move this code to parent class. | |
6789 | |
6790 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6791 Instances of this class are now able to store - besides first and second | |
6792 axes datasets - a list of annotations. This annotations are added to the | |
6793 plot after the datasets have been added. To support LegendItems for | |
6794 those annotions, it was necessary to create a the LegendItemCollection | |
6795 by ourself. This work is done while applying the themes for each series | |
6796 in the chart. | |
6797 | |
6798 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6799 | |
6800 Removed code duplication of guessWaterIncreasing() | |
6801 | |
6802 * src/main/java/de/intevation/flys/artifacts/model/WKms.java(allKms, allWs): | |
6803 Added methods to fetch all kms and all ws. | |
6804 | |
6805 * src/main/java/de/intevation/flys/utils/DataUtil.java: Generalized to | |
6806 get WKms as arguments. | |
6807 | |
6808 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
6809 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
6810 src/main/java/de/intevation/flys/artifacts/model/WQ.java: Implements | |
6811 the extended WKms interface. | |
6812 | |
6813 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
6814 Uses the generalized DataUtil.guessWaterIncreasing(). | |
6815 | |
6816 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
6817 | |
6818 flys/issue347 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
6819 flys/issue303 (Keine Streckenfavoriten, wenn nur Q im Längsschnittdiagram ausgewählt) | |
6820 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
6821 | |
6822 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: New. A | |
6823 wrapper for Annotations which allows us to provide a description for a | |
6824 set of annotations. | |
6825 | |
6826 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
6827 The getData() will now return an instance of FLYSAnnotation that wraps | |
6828 the Annotations returned by the AnnotationArtifact. The lebel of | |
6829 FLYSAnnotation is the description of this Facet. | |
6830 | |
6831 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6832 Modified the way to add Annotations. We will no longer create an empty | |
6833 series to support a LegendItem for a set of Annotations, but we will add | |
6834 a LegendItem manually to the LegendItemCollection of the plot. In | |
6835 addition, we are now able to display annotations if one of the two | |
6836 y-axes are missing. If there are no y-axes existing, we are not able to | |
6837 display annotations yet. | |
6838 | |
6839 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6840 | |
6841 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
6842 Lifted the wrong point. Now all backjump corrections look fine. :-) | |
6843 | |
6844 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
6845 | |
6846 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
6847 Fixed bugs and make use of a cache for annotations now. | |
6848 | |
6849 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6850 | |
6851 Worked on flys/issue31 | |
6852 | |
6853 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
6854 Simplified the code a lot. Needs testing. Maybe flys/issue31 is gone | |
6855 | |
6856 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
6857 | |
6858 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6859 Fetch the WstUnit value from river - the Wst itself no longer supports a | |
6860 Unit iself. | |
6861 | |
6862 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6863 | |
6864 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, | |
6865 src/main/java/de/intevation/flys/utils/DoubleUtil.java: Moved some generic | |
6866 double array code to DoubleUtil. | |
6867 | |
6868 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6869 | |
6870 * src/main/java/de/intevation/flys/utils/DoubleUtil.java (interpolateSorted): | |
6871 Added code to linear interpolate double values in a sorted array. | |
6872 Keys and values are given as double arrays. Keys need to be sorted. | |
6873 | |
6874 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6875 | |
6876 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
6877 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6878 Removed superfluous imports. | |
6879 | |
6880 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
6881 | |
6882 flys/issue330 (Dauerlinie kann nicht berechnet werden) | |
6883 | |
6884 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
6885 Add a problem if no data was found for duration curves. | |
6886 | |
6887 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
6888 | |
6889 * src/main/java/de/intevation/flys/themes/Theme.java, | |
6890 src/main/java/de/intevation/flys/themes/DefaultTheme.java: Added | |
6891 getter/setter methods to provide a facet (string) and index (int). Both | |
6892 values are written as attribute to the Theme's XML representation. | |
6893 | |
6894 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6895 Set the "facet" and "index" values of themes. | |
6896 | |
6897 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
6898 | |
6899 flys/issue346 (W-INFO / Anzeige der Höheninformation) | |
6900 | |
6901 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6902 Modified x and y axis title. The x axis title is now "RIVERNAME-km"; the | |
6903 y axis title is now "W[WST_UNIT]" where WST_UNIT depends on the unit of | |
6904 the WST. | |
6905 | |
6906 * src/main/resources/messages.properties, | |
6907 src/main/resources/messages_de_DE.properties, | |
6908 src/main/resources/messages_en.properties, | |
6909 src/main/resources/messages_de.properties: Modified i18n expressions for | |
6910 x and y axis of longitudinal section charts. | |
6911 | |
6912 2011-09-30 Ingo Weinzierl <ingo@intevation.de> | |
6913 | |
6914 flys/issue351 (W-INFO / Wasserspiegellagenberechnungen) | |
6915 | |
6916 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: Modified the | |
6917 explode() function that returns a list of values specified by min, max | |
6918 and an interval. If the last value, determined by the interval, is | |
6919 bigger than the max value, it is not included in the result list. | |
6920 | |
6921 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6922 | |
6923 flys/issue334 (Querprofil-Diagramm: Ausgabe dieses Diagrammtyps | |
6924 möglich, obwohl WSP Berechnung keine Ergebnisse liefert) | |
6925 | |
6926 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6927 (compute): Add Facets regarding CrossSections only if data available. | |
6928 | |
6929 2011-09-29 Ingo Weinzierl <ingo@intevation.de> | |
6930 | |
6931 flys/issue176 (Diagramm: Benennung eines Abflusses bei gewählter Höhe am Pegel) | |
6932 flys/issue349 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
6933 | |
6934 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
6935 Create titles for W and Q waterlevel facets with proper fractions. | |
6936 | |
6937 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6938 | |
6939 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
6940 (createStaticData, getLabels): Create proper labels for differences. | |
6941 | |
6942 2011-09-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6943 | |
6944 flys/issue244 (WINFO: Export von AT-Dateien im ersten Teil unterschiedlich) | |
6945 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
6946 | |
6947 * src/main/java/de/intevation/flys/exports/ATWriter.java: Due to a rounding | |
6948 issue the w's of the first line underun the minimal w of the curve at times. | |
6949 An extra test was introduced to suppress the output of the q's of the wrong w's. | |
6950 | |
6951 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6952 | |
6953 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
6954 Use StringUtil.wWrap , fix wrong loop, minor refac and cosmetics. | |
6955 | |
6956 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
6957 | |
6958 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
6959 Extracted/use StringUtil.wWrap . | |
6960 | |
6961 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
6962 | |
6963 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
6964 Log the gauge which has been determined. | |
6965 | |
6966 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
6967 | |
6968 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
6969 | |
6970 * src/main/java/de/intevation/flys/exports/ATExporter.java: Store the | |
6971 master Artifact which is set via setMasterArtifact(). This is required | |
6972 for meta information used while preparing the header row of AT exports. | |
6973 | |
6974 * src/main/java/de/intevation/flys/exports/ATWriter.java: Print a header | |
6975 row into the AT export for being compatible with desktop FLYS. | |
6976 | |
6977 * src/main/resources/messages.properties, | |
6978 src/main/resources/messages_de_DE.properties, | |
6979 src/main/resources/messages_en.properties, | |
6980 src/main/resources/messages_de.properties: Added header row for AT | |
6981 export files. | |
6982 | |
6983 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
6984 | |
6985 flys/issue328 (W-INFO / ÜSK: Auswahl der Wasserspiegellage / Auswahlunterstützung) | |
6986 | |
6987 * doc/conf/meta-data.xml: Added an out 'waterlevels' that might be used to | |
6988 fetch user specific waterlevels (same as longitudinal sections, but | |
6989 without Q facet). | |
6990 In addition, the system specific datacage stuff is now fetched, when: | |
6991 a) no user-id is given | |
6992 b) a user-id is given and there is a parameter 'load-system' | |
6993 | |
6994 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
6995 If the label of the WQKms object specified by the waterlevel selection | |
6996 begins with a "Q", the label is wrapped into a "W()", e.g. "W(Q=1200)". | |
6997 | |
6998 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
6999 | |
7000 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Made | |
7001 feed() able to remove existing data items from Artifact's data pool. | |
7002 Therefore, the value for the item which should be removed needs to an | |
7003 empty string. | |
7004 | |
7005 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7006 | |
7007 Extracted StringUtil.unbracket from WaterlevelSelectState.strip. | |
7008 | |
7009 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7010 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7011 Extract and use StringUtil.unbracket, minor doc. | |
7012 | |
7013 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7014 | |
7015 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
7016 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
7017 Changed access of getCurrentState() from protected to public. | |
7018 | |
7019 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: We | |
7020 use the configured Outputs instead of the actuel Outputs of an Artifact | |
7021 to make recommendations, now. This has the bad side effect of giving | |
7022 recommendations for Outputs that we might _NOT_ be able to produce. But | |
7023 otherwise, we would not be able to give recommendations for states with | |
7024 long calculation times that start background threads for calculation (as | |
7025 WSPLGEN caluclations does). | |
7026 | |
7027 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7028 | |
7029 Enable "auto-scaling" axis for waterlevels in WDifference-plots. | |
7030 | |
7031 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7032 (createSecondaryAxis, zoomY): Refactored to allow modification in | |
7033 siblings. | |
7034 | |
7035 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7036 (createSecondaryAxisRange): Override to achieve expected behavior. | |
7037 Also adjusted label. | |
7038 | |
7039 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7040 | |
7041 In W-Difference Calculation, respect indices of selected facets. | |
7042 | |
7043 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7044 (computeAdvance): Respect index of selected facets. | |
7045 | |
7046 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7047 | |
7048 flys/issue317: (Querprofil-Diagramm: Referenzen auf CrossSectionApp entfernen) | |
7049 | |
7050 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7051 Removed dependency to demo app. | |
7052 | |
7053 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
7054 Refactored to use logic from the models. | |
7055 | |
7056 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
7057 Moved some logic from the demo app to this model. | |
7058 | |
7059 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7060 | |
7061 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: New. Code | |
7062 from FloodMapState moved to its own class with the intent, to use it in | |
7063 classes different from FloodMapState. | |
7064 | |
7065 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7066 Removed the inner class FacetCreator. | |
7067 | |
7068 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
7069 an instance of FacetCreator. | |
7070 NOTE: Maybe we should move the WSPLGEN parameters into an own class | |
7071 which might be serializable. | |
7072 | |
7073 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use the | |
7074 FacetCreator instance stored in the WSPLGENJob to create a new WSPLGEN | |
7075 facet if the calculation was successfully (without errors). Finally, the | |
7076 facets of FacetCreator are added to the Facet list of the FLYSArtifacts. | |
7077 | |
7078 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7079 | |
7080 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7081 Put Artifact in background mode first before starting WSPLGEN, otherwise | |
7082 a very fast errors (call CallContext.afterBackground() before Artifact is | |
7083 in Background mode) might lead to an inconsistent state. | |
7084 | |
7085 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Repaired | |
7086 broken error num parsing. | |
7087 | |
7088 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7089 | |
7090 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Track | |
7091 critical errors as well (improved regular expression for errors). | |
7092 | |
7093 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7094 | |
7095 * ChangeLog: Fixed whitespace usage. | |
7096 | |
7097 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7098 | |
7099 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java, | |
7100 src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java | |
7101 src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
7102 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7103 Removed superfluous imports. | |
7104 | |
7105 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7106 | |
7107 flys/issue68 (Diagramm: Werte an der Y-Achse benötigen i18n) | |
7108 | |
7109 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
7110 method to retrieve the current/preferred locale specified by CallMeta. | |
7111 | |
7112 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7113 Introduced two methods localizeDomainAxis() and localizeRangeAxis(). | |
7114 Both methods of this class override the NumberFormat used to format axes | |
7115 numbers. Those methods are called by localizeAxes() - which has private | |
7116 access - for each domain and range axis of the current XYPlot. | |
7117 | |
7118 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7119 | |
7120 * doc/conf/cache.xml: Number of cached annotations was much | |
7121 to low. | |
7122 | |
7123 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7124 | |
7125 Improved w-differences diagram generation where multiple differences | |
7126 can be shown. | |
7127 | |
7128 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
7129 New facet type. | |
7130 | |
7131 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7132 Employ new DifferenceCurveFacet, return CalculationResult that can | |
7133 store more than one WKms. | |
7134 | |
7135 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
7136 | |
7137 flys/issue320 (ÃœSK:Mapserver hat Probleme beim Shapefilepath mit "../" im Pfad) | |
7138 | |
7139 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Use | |
7140 File.getCanonicalPath() to substitute "../" in shapefile directories. | |
7141 | |
7142 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
7143 | |
7144 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7145 The extent of the WSPLGEN result layer is now specified by the extent of | |
7146 the CrossSectionTracks that matches the start and end kilometer of the | |
7147 WSPLGEN calculation. | |
7148 | |
7149 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New function | |
7150 that creates the OpenLayers bounding box based on two Geometries. | |
7151 | |
7152 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7153 | |
7154 Improved w-differences diagram generation with included "absolute" | |
7155 values. | |
7156 | |
7157 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7158 Fixed one (of two) incorrect labels. | |
7159 (doWaterlevelOut): Survive non-found gauge, fetch kilometer and w | |
7160 instead of values for w and q. | |
7161 | |
7162 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7163 | |
7164 Add positional-conflict-awareness when merging Facets for a | |
7165 FLYSArtifactCollection. First come first serve. | |
7166 | |
7167 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7168 (writeFacets): First, sort incoming facets into 2 groups: | |
7169 "genuinely new" and "already there", then for each new check | |
7170 whether the position is already taken. If so, push "up" (position++) | |
7171 until no conflict exists anymore. | |
7172 | |
7173 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
7174 | |
7175 flys/issue296 (Karte: Bezeichnungen verbessern) | |
7176 | |
7177 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7178 I18N of the WSPLGEN and barriers facets (WMS layers). | |
7179 | |
7180 * src/main/resources/messages.properties, | |
7181 src/main/resources/messages_de_DE.properties, | |
7182 src/main/resources/messages_en.properties, | |
7183 src/main/resources/messages_de.properties: Added strings for the wsplgen | |
7184 and barriers WMS layers. | |
7185 | |
7186 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7187 | |
7188 Fix (revert) access to position in ManagedDomFacet. | |
7189 | |
7190 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
7191 (getPosition): Do not add prefix when querying position ("pos") | |
7192 attribute, add a logger for faster future debugging. | |
7193 | |
7194 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7195 | |
7196 Squash positional conflict-bug. | |
7197 | |
7198 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7199 (mergeFacets): Removed, replaced in parts by pickFacet. | |
7200 (pickFacet): New, return facet to be added to document. | |
7201 Documentation added. | |
7202 | |
7203 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7204 | |
7205 Squash a bug about wrongly named "art:pos" attribute in ManagedDomFacet (was | |
7206 "pos"). Added documentation from commit message. | |
7207 | |
7208 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
7209 Added documentation (commit message with minor adjustments). | |
7210 (getPosition, setPosition): Include PREFIX in attribute name. | |
7211 | |
7212 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7213 | |
7214 Refactoring, doc. | |
7215 | |
7216 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7217 (mergeFacets): Removed, replaced in parts by pickFacet. | |
7218 (pickFacet): New, return facet to be added to document. | |
7219 Documentation added. | |
7220 | |
7221 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7222 | |
7223 Cosmetics, docs. | |
7224 | |
7225 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7226 Documentation added. | |
7227 | |
7228 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7229 | |
7230 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
7231 Subclasses the FLYSService now - this should improve the database | |
7232 connection handling. | |
7233 | |
7234 2011-09-22 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7235 | |
7236 * doc/mapserver/mosel-mapfile.map: | |
7237 Full blown mosel wms mapfile. | |
7238 | |
7239 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7240 | |
7241 * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: | |
7242 New. A subclass of DefaultService which is used in FLYS to init and | |
7243 shutdown database connections. | |
7244 | |
7245 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
7246 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
7247 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7248 Centralized the initialization and shutdown of database connections. | |
7249 These services now subclass FLYSService which handles the database stuff. | |
7250 | |
7251 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: The | |
7252 current database connection is not closed here - this is done in a | |
7253 Service or in the CallContext. | |
7254 | |
7255 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: It's | |
7256 not necessary to create new database connections here. We already have | |
7257 an existing connection which is initialized by CallContext. | |
7258 | |
7259 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
7260 | |
7261 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
7262 Override validate() of parent classes to suppress "step" validation | |
7263 which is not present in this state. | |
7264 | |
7265 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: Added | |
7266 new method validateBounds() which really just validates a boundary | |
7267 without "step" parameter. | |
7268 | |
7269 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7270 | |
7271 Added WaterlevelArtifact to accompany WINFOArtifacts in WDifferencesPlots. | |
7272 | |
7273 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
7274 New WaterlevelArtifact. | |
7275 | |
7276 * doc/conf/conf.xml: | |
7277 Added configuration for WaterlevelArtifact configuration (path to state-xml) | |
7278 waterlevel-factory. | |
7279 | |
7280 * doc/conf/artifacts/waterlevel.xml: | |
7281 New, trivial state description for Waterlevelartifact. | |
7282 | |
7283 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
7284 New, only state for WaterlevelArtifact. | |
7285 | |
7286 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7287 | |
7288 Cosmetics, docs. | |
7289 | |
7290 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
7291 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
7292 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7293 Cosmetics, documentation. | |
7294 | |
7295 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7296 | |
7297 Added WaterlevelOut-processing ability to WDifferencesCurveGenerator. | |
7298 | |
7299 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7300 Process LONGITUDINAL_W facets. | |
7301 | |
7302 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7303 | |
7304 Improved WDifferenceState in preparation to be able to deal with multiple | |
7305 pairs for differences. | |
7306 | |
7307 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7308 Prepare multiple-pairs-case. | |
7309 | |
7310 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
7311 | |
7312 flys/issue315 (Überschwemmungsfläche: String bei Streckenauswahl) | |
7313 | |
7314 * doc/conf/artifacts/winfo.xml: Added a new state for floodmap's range | |
7315 input. This state will accept a km range only, there is no step width. | |
7316 | |
7317 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
7318 New. The state which is used to enter a km range with step width. | |
7319 | |
7320 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7321 | |
7322 Cosmetics, improved debug output, doc. | |
7323 | |
7324 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
7325 Improved debug output. | |
7326 | |
7327 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
7328 Added documentation. | |
7329 | |
7330 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
7331 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
7332 Removed commented code. | |
7333 | |
7334 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
7335 Whitespace cosmetics. | |
7336 | |
7337 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7338 | |
7339 Avoid NullPointerException when drawing XYChart without data. | |
7340 | |
7341 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
7342 Guard calls to dataset to avoid NullPointerException. | |
7343 | |
7344 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
7345 | |
7346 flys/issue325 (FLYS Client: Auswahl des DGM zeigt numerischen Wert an) | |
7347 | |
7348 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Write | |
7349 a better label for the selected DEM into the static DESCRIBE. Use the | |
7350 name of the DEM file as label instead of the database id. | |
7351 | |
7352 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7353 | |
7354 * doc/mapserver/fontset.txt: | |
7355 Added initial font set for km_annotation layer. | |
7356 * doc/mapserver/symbols/symbols.sym: | |
7357 Added square symbol for km and fixpoint layer. | |
7358 * doc/mapserver/saar-mapfile.map: | |
7359 Adjust styling in the flys karte-archiv way. | |
7360 | |
7361 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
7362 | |
7363 Tagged RELEASE 2.5 | |
7364 | |
7365 * Changes: Prepared changes for release. | |
7366 | |
7367 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
7368 | |
7369 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7370 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
7371 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
7372 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
7373 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
7374 needless imports. | |
7375 | |
7376 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7377 | |
7378 * doc/conf/meta-data.xml: Improved datacage configuration for DEMs. | |
7379 | |
7380 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7381 Query DGMs by the given ID in the FLYS data pool - not by given range | |
7382 values. | |
7383 | |
7384 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7385 | |
7386 * doc/conf/meta-data.xml: Added a section for DEMs to the floodmap | |
7387 section. | |
7388 | |
7389 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7390 | |
7391 Fix build. | |
7392 | |
7393 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
7394 Fix build. | |
7395 | |
7396 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7397 | |
7398 Take a given WaterlevelPair-String, load artifact and plot the diff. | |
7399 | |
7400 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
7401 Load correct artifacts. | |
7402 | |
7403 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
7404 | |
7405 * doc/mapserver/*: Added inital mapserver configuration files. | |
7406 | |
7407 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7408 | |
7409 * doc/conf/meta-data.xml: Moved the system specific configuration into a | |
7410 macro to the top of the configuration document. Call this macro at the | |
7411 end of the user specific part and in the part that should contain the | |
7412 system specific stuff only! | |
7413 | |
7414 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7415 | |
7416 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7417 Defined createItem() here and adapted some method signatures, because I | |
7418 need the CallContext deeper in code than expected. | |
7419 | |
7420 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7421 Write the name of the selected waterlevel into the static DESCRIBE. | |
7422 | |
7423 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
7424 Adapted method signatures that have been changed in DefaultState. | |
7425 | |
7426 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7427 Removed method createItem() which is now defined in the upper class | |
7428 DefaultState. | |
7429 | |
7430 * src/main/resources/messages.properties, | |
7431 src/main/resources/messages_de_DE.properties, | |
7432 src/main/resources/messages_en.properties, | |
7433 src/main/resources/messages_de.properties: Added string for selected | |
7434 waterlevel that is displayed in static UI. | |
7435 | |
7436 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
7437 | |
7438 * src/main/resources/messages.properties, | |
7439 src/main/resources/messages_de_DE.properties, | |
7440 src/main/resources/messages_en.properties, | |
7441 src/main/resources/messages_de.properties: Added state label for | |
7442 waterlevel selection. | |
7443 | |
7444 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7445 | |
7446 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7447 Validate incoming data string and strip brackets. | |
7448 | |
7449 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7450 Fetch waterlevel data from external Artifact if existing. If no external | |
7451 Artifact is specified that provides waterlevel data, we gonna try to | |
7452 fetch it from the current Artifact. | |
7453 | |
7454 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7455 | |
7456 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7457 Removed needless import which caused compile errors. | |
7458 | |
7459 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7460 | |
7461 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7462 Added a transform() method. This method should be used to transform | |
7463 input data in form of a string into a better data structure. This state | |
7464 provides a simple implementation which just returns a StateData object | |
7465 that contains exactly the input string. | |
7466 | |
7467 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Transform | |
7468 input strings using DefaultState.transform() before they are added to | |
7469 its data pool. | |
7470 | |
7471 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7472 | |
7473 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7474 Made collection solid for the case if it has no Artifacts. | |
7475 | |
7476 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
7477 | |
7478 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Fetch Artifact | |
7479 from ArtifactDatabase properly. Write better error logs if that process | |
7480 fails. | |
7481 | |
7482 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7483 | |
7484 Extend WDifferences branch to have calculations in dedicated, new state. | |
7485 | |
7486 * doc/conf/artifacts/winfo.xml: Added new State and Transition in | |
7487 WDifferences-branch. | |
7488 | |
7489 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
7490 New state. | |
7491 | |
7492 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7493 Specify to not take input, prepare getting other facets. | |
7494 | |
7495 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
7496 | |
7497 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: This | |
7498 state now desires the UIProvider 'dem_datacage_panel'. | |
7499 | |
7500 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
7501 New. This state is used to define the desired UIProvider | |
7502 'wsp_datacage_panel'. | |
7503 | |
7504 * doc/conf/artifacts/winfo.xml: Added a new way to start a WSPLGEN | |
7505 calculation when choosing the calculation type 'floodmap'. | |
7506 | |
7507 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
7508 | |
7509 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Merge | |
7510 facets only if their name AND their owner artifact are equal. | |
7511 | |
7512 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7513 | |
7514 Partial Fix flys/issue304 (3) (Baseline). | |
7515 | |
7516 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7517 Show Baseline in WDifferencesPlot. | |
7518 | |
7519 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7520 | |
7521 Fix flys/issue310 (cross-section theme). | |
7522 | |
7523 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
7524 | |
7525 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7526 | |
7527 Fix flys/issue310 (cross-section theme). | |
7528 | |
7529 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
7530 | |
7531 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
7532 | |
7533 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7534 Add an quick and simple error to the report if an error occured while | |
7535 WSPLGENJob creation. | |
7536 | |
7537 * src/main/resources/messages.properties, | |
7538 src/main/resources/messages_de_DE.properties, | |
7539 src/main/resources/messages_en.properties, | |
7540 src/main/resources/messages_de.properties: Added error messages for | |
7541 WSPLGEN job creation errors. | |
7542 | |
7543 2011-09-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7544 | |
7545 Fix crash when drawing StickyAxisAnnotation when no range was given. | |
7546 User-directed issues remain ( flys/issue303 ). | |
7547 | |
7548 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java | |
7549 (draw): | |
7550 Guard access to domainAxis, rangeAxis and the corresponding ranges. | |
7551 Warn and exit if any was null. | |
7552 | |
7553 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
7554 | |
7555 flys/issue290 (Karte: Eingabe von Differenzen zw. WSP und Gelände findet | |
7556 keine Ausprägung in der Karte) | |
7557 | |
7558 * doc/conf/mapserver/wsplgen_class.vm: Added styles for DIFF attribute. | |
7559 | |
7560 * doc/conf/mapserver/mapfile.vm: Set debug default to '5'. | |
7561 | |
7562 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7563 | |
7564 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7565 Add a first WSPLGEN status message (notifies the user about a | |
7566 queued job) after the job has been added to the Scheduler. | |
7567 | |
7568 * src/main/resources/messages.properties, | |
7569 src/main/resources/messages_de_DE.properties, | |
7570 src/main/resources/messages_en.properties, | |
7571 src/main/resources/messages_de.properties: Added english and german | |
7572 status message text. | |
7573 | |
7574 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7575 | |
7576 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Write | |
7577 shapefiles only if there are features for it existing. | |
7578 | |
7579 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7580 A WSPLGEN facet is only created, if the calculation was successfully | |
7581 added to the Scheduler. A barrier facet is only created if the WSPLGEN | |
7582 calculation has been added to the scheduler AND if there are digitized | |
7583 geometries existing. | |
7584 | |
7585 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7586 | |
7587 Copied and slightly modified implementation of guessWaterIncreasing from | |
7588 WQKms to (new) DataUtils. Accidentally commited usage in last commit, to | |
7589 correct orientation of diagram (invert x axis). | |
7590 | |
7591 * src/main/java/de/intevation/flys/utils/DataUtils.java: | |
7592 New file with guessWaterIncreasing implementation from WQKms, | |
7593 slightly adjusted. | |
7594 | |
7595 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7596 | |
7597 Cosmetics. | |
7598 | |
7599 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
7600 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
7601 Cosmetics. | |
7602 | |
7603 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7604 | |
7605 Added CSV Export for W-Differences. | |
7606 | |
7607 * doc/conf/conf.xml: Added Exporter. | |
7608 | |
7609 * doc/conf/artifacts/winfo.xml: Removed transition over distances | |
7610 state, added export outputmode and facet. | |
7611 | |
7612 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
7613 New, CSV-Exporter for WDifferences. | |
7614 | |
7615 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7616 Add export facet. | |
7617 | |
7618 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7619 | |
7620 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
7621 Cosmetics, docs. | |
7622 | |
7623 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
7624 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
7625 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
7626 Cosmetics. | |
7627 | |
7628 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7629 | |
7630 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7631 Sourced the code to append a concrete data item to the static DESCRIBE | |
7632 part out to an own method (appendStaticData()). | |
7633 | |
7634 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
7635 Override appendStaticData() to suppress the GeoJSON string to be | |
7636 included in the static DESCRIBE. | |
7637 | |
7638 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
7639 | |
7640 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
7641 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
7642 src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
7643 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
7644 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
7645 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
7646 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
7647 Removed needless imports. | |
7648 | |
7649 2011-09-09 Ingo Weinzierl <ingo@intevation.de> | |
7650 | |
7651 * src/main/java/de/intevation/flys/artifacts/model/CalculationMessage.java: | |
7652 New. A subclass of Message (in the Artifacts system). It stores a | |
7653 string message and a progress (in form of step x/y). | |
7654 | |
7655 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: The observer | |
7656 now writes background messages into the artifact system using the | |
7657 CallContext.addBackgroundMessage(). We use instances of | |
7658 CalculationMessage here, that makes the WINFOArtifact able to put | |
7659 progress information into the Artifact's DESCRIBE as well. | |
7660 | |
7661 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Write | |
7662 status message and progress information into the DESCRIBE if the | |
7663 Artifact has started a background process. | |
7664 | |
7665 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7666 | |
7667 Fix flys/issue280 . | |
7668 | |
7669 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
7670 Do not draw boxes around annotations. | |
7671 | |
7672 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7673 | |
7674 Fix flys/issue279 . | |
7675 | |
7676 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7677 Fix behaviour in various thinkable malconditions. | |
7678 | |
7679 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7680 | |
7681 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7682 Made one case of cross section fetching more robust. | |
7683 | |
7684 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7685 | |
7686 Fix Facet name and Legend of W-Differences, also insert state to specify | |
7687 distance. | |
7688 | |
7689 * doc/conf/artifacts/winfo.xml: Add additional transitions to walk over | |
7690 distances state. | |
7691 | |
7692 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7693 Set facets description. | |
7694 | |
7695 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7696 Take facets description as legend. | |
7697 | |
7698 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7699 | |
7700 Added configuration to kick-in w-differences branch of winfo. | |
7701 | |
7702 * doc/conf/conf.xml: Register new (w-differences) OutputGenerators. | |
7703 | |
7704 * doc/conf/artifacts/winfo.xml: Register new state and transitions. | |
7705 | |
7706 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7707 Added new (w-differences) calculation mode. | |
7708 | |
7709 * src/main/java/de/intevation/flys/exports/WDifferencesCurveInfoGenerator.java: | |
7710 New file, implementing naive approach to display w-differences | |
7711 (accidentially omitted in last commit). | |
7712 | |
7713 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7714 | |
7715 Added very stubby WDifferences State/OutGenerator for WINFOArtifact. | |
7716 | |
7717 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
7718 Added w_differences facet type. | |
7719 | |
7720 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
7721 New file, implements naive approach to calculate w-differences (of | |
7722 calculations identified by hardcoded uuids!) and register respective facet. | |
7723 | |
7724 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
7725 New file, implementing naive approach to display w-differences. | |
7726 | |
7727 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7728 | |
7729 Implement getArtifact(uuid,context) in FLYSUtils. | |
7730 | |
7731 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getArtifact): | |
7732 Added implementation, partially resolving a TODO. Added logger instance. | |
7733 | |
7734 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
7735 | |
7736 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: | |
7737 New. This sublcass of Calculation saves warnings and errors that occur | |
7738 while WSPLGEN is running. | |
7739 Note, that the interface of this class doesn't exactly apply the interface | |
7740 of Calculation. Maybe, we should generalize this interface! | |
7741 | |
7742 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
7743 an instance of WSPLGENCalculation now. We use this instance to save | |
7744 warnings and errors. | |
7745 | |
7746 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Use the | |
7747 WSPLGENCalculation to save errors and warnings. | |
7748 | |
7749 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENReportFacet.java: | |
7750 New. This facet is used for WSPLGEN reports. It stores an instance of | |
7751 WSPLGENCalculation which saves ERRORS and WARNINGS that occur while | |
7752 WSPLGEN execution. | |
7753 | |
7754 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7755 Create a WSPLGENReportFacet for WSPLGEN reports. | |
7756 | |
7757 * doc/conf/conf.xml: Added an OutputGenerator 'report' for WSPLGEN | |
7758 reports. | |
7759 | |
7760 * doc/conf/artifacts/winfo.xml: Added an output 'report' for WSPLGEN | |
7761 reports. | |
7762 | |
7763 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7764 | |
7765 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
7766 src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java, | |
7767 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7768 Cosmetics, docs. | |
7769 | |
7770 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
7771 | |
7772 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: Small | |
7773 adjustments that makes it easier to subclass this observer. | |
7774 | |
7775 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: New. A | |
7776 sublcass of JobObserver which analyses the WSPLGEN output for errors and | |
7777 warnings. | |
7778 | |
7779 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use | |
7780 JobObserver and ProblemObserver to track the whole WSPLGEN output and | |
7781 print number of errors/warnings to log output. | |
7782 | |
7783 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7784 | |
7785 Added translation of w_differences. | |
7786 | |
7787 * src/main/resources/messages_de_DE.properties, | |
7788 src/main/resources/messages_de.properties, | |
7789 src/main/resources/messages_en.properties, | |
7790 src/main/resources/messages.properties: | |
7791 Added "w_differnces" translation. | |
7792 | |
7793 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
7794 | |
7795 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
7796 a new attribute 'background-processing' to the DESCRIBE of this | |
7797 Artifact. Its value is 'true' if this Artifact has started a background | |
7798 thread which has not finished yet - otherwise it is 'false. | |
7799 | |
7800 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
7801 | |
7802 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
7803 src/main/java/de/intevation/flys/utils/GeometryUtils.java: Moved the | |
7804 code to determine the extent of a river based on its axis to | |
7805 GeometryUtils. | |
7806 | |
7807 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7808 Determine the extent of the selected river and set the WMSLayerFacet's | |
7809 extent attribute. | |
7810 | |
7811 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7812 | |
7813 Added Themeing support for CrossSection Diagrams. | |
7814 | |
7815 * doc/conf/themes.xml: | |
7816 Added new themes and mappings, slightly modified longitudinalsection | |
7817 theme. | |
7818 | |
7819 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7820 | |
7821 In CrossSection Diagram fix subtitle to display the km of which the data is | |
7822 actually displayed (maybe contrasting users wish). | |
7823 | |
7824 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7825 (getCrossSectionSnapKm): New method to fetch the actual km of crosssection. | |
7826 | |
7827 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
7828 Add correct km to charts subtitle. | |
7829 | |
7830 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7831 | |
7832 Fix various display-issues like i18n in cross-section diagram. | |
7833 | |
7834 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
7835 Set description of facets to expected values. | |
7836 | |
7837 * src/main/java/de/intevation/flys/artifacts/exports/CrossSectionGenerator.java: | |
7838 Fix i18n of chart title. Set subtitle to expected value, pass facets | |
7839 description to StyledSeries to see expected legend. | |
7840 | |
7841 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7842 | |
7843 Cosmetics, resolved refactoring todo. | |
7844 | |
7845 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java | |
7846 (compute, computeAdvance, computeFeed): Refactored, extracted method, | |
7847 resolving duplicate code and TODO. | |
7848 | |
7849 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7850 | |
7851 Fix waterline "calculation" at given km. Chosen approach is | |
7852 "head-through-wall". | |
7853 | |
7854 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7855 Some refactoring to do the same calculation twice easier and be able | |
7856 to "cross" waterline against correct profile data. | |
7857 | |
7858 | |
7859 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7860 | |
7861 Fix setting of kilometer for profile (not yet waterlevel) of cross section | |
7862 diagram. | |
7863 | |
7864 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7865 (getCrossSectionData): Respect corss_section.km data; do naive linear | |
7866 search for profile data for this km. | |
7867 | |
7868 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
7869 Declare a ComputeType. | |
7870 | |
7871 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
7872 Implement computeFeed. | |
7873 | |
7874 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7875 | |
7876 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
7877 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7878 Minor cosmetics. | |
7879 | |
7880 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
7881 | |
7882 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
7883 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
7884 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
7885 src/main/java/de/intevation/flys/artifacts/state/DefaultState.java: | |
7886 Cosmetics, docs. | |
7887 | |
7888 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
7889 | |
7890 * doc/conf/mapserver/barrier_polygons_class.vm, | |
7891 doc/conf/mapserver/barrier_lines_class.vm, | |
7892 doc/conf/mapserver/wsplgen_class.vm: Default Mapserver styles for | |
7893 barriers and WSPLGEN results. Those styles are only used as long as we | |
7894 don't have map specific themes (as already used in charts). | |
7895 | |
7896 * doc/conf/mapserver/layer.vm: Implements a fallback mechanism for styling | |
7897 barrier lines/polygons and WSPLGEN results. | |
7898 | |
7899 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added a | |
7900 getStyle() method that currently returns "null". This method needs to be | |
7901 implemented when map themes are introduced. | |
7902 | |
7903 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
7904 | |
7905 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Renamed | |
7906 some attributes to make their job in the mapfile more obvious. | |
7907 | |
7908 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
7909 new facet type for barriers. | |
7910 | |
7911 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: Add | |
7912 a facet for the barriers layer. | |
7913 | |
7914 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Parse | |
7915 barriers (lines and polygons) and create two new layers for each type - | |
7916 those layers are grouped. | |
7917 | |
7918 * doc/conf/mapserver/layer.vm: Renamed attribute based on changes in | |
7919 LayerInfo and added support for Group-Layers. | |
7920 | |
7921 2011-09-06 Raimund Renkert <raimund.renkert@intevation.de> | |
7922 | |
7923 * doc/conf/conf.xml: | |
7924 Added driver to database configuration for use with postgresql. | |
7925 | |
7926 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
7927 | |
7928 * doc/conf/mapserver/mapfile.vm: Removed FONTSET attribute and set quotes | |
7929 for SHAPEPATH. | |
7930 | |
7931 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
7932 | |
7933 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
7934 Removed. We gonna use the WMSLayerFacet until now. | |
7935 | |
7936 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7937 Add a WMSLayerFacet after we triggered the Scheduler to start a WSPLGEN | |
7938 calculation. | |
7939 | |
7940 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
7941 | |
7942 * doc/conf/mapserver/layer.vm, | |
7943 doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements. | |
7944 | |
7945 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the | |
7946 MapfileGenerator after a WSPLGEN job has finished regardless if it has | |
7947 been finished successfully or not. | |
7948 | |
7949 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
7950 | |
7951 * pom.xml: Added Apache Velocity 1.7 for templating support. | |
7952 | |
7953 * doc/conf/conf.xml: Added config options for mapserver/template relevant | |
7954 stuff. | |
7955 | |
7956 * doc/conf/mapserver/mapfile.vm, | |
7957 doc/conf/mapserver/layer.vm: New. A default mapfile template and a | |
7958 template used for layers. | |
7959 | |
7960 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: New. | |
7961 This class is used while reading WMS layer relevant information from | |
7962 filesystem. | |
7963 | |
7964 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: New. This | |
7965 thread is used for creating mapfiles for Mapserver. The MapfileGenerator | |
7966 runs in daemon mode (own thread) and creates mapfiles based on WMS | |
7967 layer relevant information read from filesystem. | |
7968 | |
7969 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
7970 src/main/java/de/intevation/flys/utils/FLYSUtils.java: Moved shapefile | |
7971 specific XPath expressions from FloodMapState to FLYSUtils which is a | |
7972 better place to use it in other classes (as MapfileGenerator). | |
7973 | |
7974 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
7975 | |
7976 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: | |
7977 Bugfixed broken attribute assignment. | |
7978 | |
7979 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Call | |
7980 CallContext.afterBackground() after a WSPLGEN job has finished to remove | |
7981 the background lock from Artifact. | |
7982 | |
7983 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
7984 Call CallContext.afterCall(BACKGROUND) to lock the Artifact for | |
7985 background processing. | |
7986 | |
7987 2011-09-02 Ingo Weinzierl <ingo@intevation.de> | |
7988 | |
7989 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: New. This | |
7990 class is used to start WSPLGEN for a specific WSPLGENJob. The System | |
7991 property "wsplgen.bin.path" tells the JobExecutor where the WSPLGEN | |
7992 binary is placed (which means in general, the property points to the | |
7993 'wsplgen.exe'). | |
7994 | |
7995 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: New. This | |
7996 scheduler currently allows to start just a single WSPLGEN Thread. All | |
7997 WSPLGEN calculations should be started using Scheduler.addJob(). | |
7998 | |
7999 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: New. This | |
8000 thread reads log messages from WSPLGEN and listens for specific | |
8001 messages. It should be used to update status messages of the WSPLGEN | |
8002 calculation that is currently running. | |
8003 There is a System property that tells the JobObserver to log all WSPLGEN | |
8004 output to log4j: enable WSPLGEN output with "-Dwsplgen.log.output=true". | |
8005 | |
8006 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Added | |
8007 the FLYSArtifact, the current working directory and the CallContext. | |
8008 | |
8009 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8010 Use the Scheduler to start new WSPLGEN calculations. | |
8011 | |
8012 2011-09-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8013 | |
8014 Add CrossSectionInfoGenerator. | |
8015 | |
8016 * src/main/java/de/intevation/flys/exports/CrossSectionInfoGenerator.java: | |
8017 New, trivial implementation of CrossSectionInfoGenerator. | |
8018 | |
8019 * doc/conf/conf.xml: | |
8020 Register CrossSectionInfoGenerator. | |
8021 | |
8022 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8023 | |
8024 Cleanups of CrossSection*. | |
8025 | |
8026 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8027 New methods to retrieve name of utilized CrossSection. | |
8028 | |
8029 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8030 Cleanup, get rid of copied unused method, documentation and more sensible | |
8031 translations. | |
8032 | |
8033 * src/main/resources/messages_de_DE.properties, | |
8034 src/main/resources/messages_de.properties, | |
8035 src/main/resources/messages_en.properties, | |
8036 src/main/resources/messages.properties: | |
8037 Added cross_section* translations, also cleanups. | |
8038 | |
8039 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8040 | |
8041 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8042 Set the "typ" attribute of lines and polygons in barrier shapefiles. | |
8043 | |
8044 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8045 | |
8046 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8047 Set the Z values of line and polygon barrier geometries. Both barrier | |
8048 shapefiles will contain 3D geometries now. | |
8049 | |
8050 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8051 | |
8052 Get real data to display in CrossSection (although ignorant of | |
8053 parameterization), making use of the showcase code of the CrossSectionApp- | |
8054 Standalone application. | |
8055 | |
8056 * doc/conf/artifacts/winfo.xml: Add new facet (~waterline) to state/out. | |
8057 | |
8058 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8059 New methods to get relevant data. So far just takes the first value of | |
8060 everything and assuming a waterlevel at 130m. | |
8061 | |
8062 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
8063 New Facet responsible of water level in cross section. | |
8064 | |
8065 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
8066 Made some functionality publicly and statically available. | |
8067 | |
8068 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
8069 Update call. | |
8070 | |
8071 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added new | |
8072 Facet type. | |
8073 | |
8074 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8075 Added new Facet to out. | |
8076 | |
8077 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8078 Respect new facet and facets data. | |
8079 | |
8080 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8081 | |
8082 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Close an open | |
8083 shapefile transaction and catch exceptions which are thrown while | |
8084 shapefile creation here. If there occured an error, this functions | |
8085 returns FALSE, otherwise TRUE. | |
8086 | |
8087 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8088 Removed exception handling while shapefile creation - this is done in | |
8089 GeometryUtils now. | |
8090 | |
8091 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8092 | |
8093 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8094 Renamed the file for WSPLGEN required waterlevels to "waterlevels.wst". | |
8095 WSPLGEN did not work with the former "waterlevels.txt" file. | |
8096 | |
8097 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
8098 | |
8099 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New static | |
8100 function that builds new SimpleFeatureTypes with additional attributes. | |
8101 | |
8102 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8103 Write attributes "ELEVATION" and "KILOMETER" into the crosssection | |
8104 tracks shapefiles. | |
8105 | |
8106 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8107 | |
8108 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
8109 stub that should return a FLYSArtifact based on a given UUID. | |
8110 | |
8111 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8112 Write the selected WST file for WSPLGEN. Note, that this is the WST file | |
8113 of the current WINFO artifact. Furthermore, there is currently no way | |
8114 for the user to select a column from WST file, so we currently use the | |
8115 column that is written to WST file at first. | |
8116 | |
8117 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8118 | |
8119 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
8120 the parameter order of a compute(...) method. This makes me able to call | |
8121 this without a hash value. | |
8122 | |
8123 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
8124 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
8125 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
8126 Adapted the parameter order of the compute() call (see above). | |
8127 | |
8128 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8129 | |
8130 More bones to CrossSection sceleton. | |
8131 | |
8132 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
8133 src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
8134 New, yet trivial implementations of Factory and Facet for CrossSections. | |
8135 | |
8136 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8137 Add new CrossSection- (instead of Default-)Facet. | |
8138 | |
8139 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
8140 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8141 Adjusted to use (touch) new Factory and Facet. | |
8142 | |
8143 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8144 | |
8145 Cosmetics. | |
8146 | |
8147 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8148 Cosmetics. | |
8149 | |
8150 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8151 | |
8152 Cosmetics. | |
8153 | |
8154 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
8155 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8156 src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
8157 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8158 Removed obselete imports. | |
8159 | |
8160 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8161 Removed obselete imports, whitespaces. | |
8162 | |
8163 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8164 Whitespaces, docs. | |
8165 | |
8166 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8167 | |
8168 Fix translations of Main Values Facets. | |
8169 | |
8170 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8171 Do acrobatics to keep state transient but get translated title. | |
8172 | |
8173 * src/main/java/de/intevation/flys/artifacts/MainValuesQFacet.java, | |
8174 src/main/java/de/intevation/flys/artifacts/MainValuesWFacet.java: | |
8175 Changed constructor to get description (which is then already be translated) | |
8176 dynamically, adjust deepCopy. | |
8177 | |
8178 * src/main/java/de/intevation/flys/states/StaticState.java: | |
8179 Adjust constructor accordingly. | |
8180 | |
8181 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8182 | |
8183 Add sceleton for CrossSection outs. | |
8184 | |
8185 * doc/conf/artifacts/winfo.xml: | |
8186 Added new output mode to respective state of winfo artifact configuration. | |
8187 | |
8188 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
8189 Add new Dummy-Facet in state. | |
8190 | |
8191 * doc/conf/conf.xml: | |
8192 Registered new OutputGenerator. | |
8193 | |
8194 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8195 Added new CROSS_SECTION type. | |
8196 | |
8197 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
8198 New, stubby skeleton for an CrossSectionGenerator. | |
8199 | |
8200 * src/main/resources/messages_de_DE.properties, | |
8201 src/main/resources/messages_de.properties, | |
8202 src/main/resources/messages_en.properties, | |
8203 src/main/resources/messages.properties: | |
8204 Added cross_section translation, also cleanups (e.g. main values). | |
8205 | |
8206 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8207 | |
8208 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Marked | |
8209 required parameters with a comment. | |
8210 | |
8211 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8212 Export floodplains (german 'Talaue') to shapefile and write its file | |
8213 path into the WSPLGEN job. | |
8214 | |
8215 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
8216 | |
8217 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8218 Search for a DGM that fits to the current river and km range and write | |
8219 its file path into the WSPLGEN job. | |
8220 | |
8221 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8222 | |
8223 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Improved | |
8224 exception handling: exceptions are catched in GeometryUtils now. | |
8225 | |
8226 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8227 Write river axis and crosssections to shapefiles and save shapefile | |
8228 pathes in WSPLGENJob. | |
8229 | |
8230 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8231 | |
8232 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8233 Use the coorect SRID for reading GeoJSON and writing line/polygon | |
8234 shapefiles. | |
8235 | |
8236 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Use a | |
8237 concrete coordinate system while feature type creation. | |
8238 | |
8239 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8240 | |
8241 * pom.xml: Added GeoTools 2.7.2 dependencies for Shapefile, GeoJSON and | |
8242 EPSG support. | |
8243 | |
8244 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Store | |
8245 'LIN' parameter in a list now. A WSPLGEN parameter might contain many | |
8246 LINs. | |
8247 | |
8248 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New functions | |
8249 to create FeatureTypes and to write shapefiles. | |
8250 | |
8251 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8252 Write user specified barriers into a shapefile placed in the artifact | |
8253 directory. | |
8254 | |
8255 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
8256 | |
8257 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
8258 that extracts the SRID defined in the global configuration file for a | |
8259 given river. | |
8260 | |
8261 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
8262 Removed the code that extracts the river SRID - use FLYSUtils instead. | |
8263 | |
8264 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8265 | |
8266 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8267 | |
8268 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
8269 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8270 | |
8271 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8272 | |
8273 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8274 | |
8275 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
8276 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8277 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
8278 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
8279 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
8280 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
8281 | |
8282 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8283 | |
8284 Commit accidentally omitted result of refactoring (WINFO/FLYSUtils/getRiver). | |
8285 | |
8286 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
8287 Removed implementations of getRiver, update calls to use FLYSUtils. | |
8288 | |
8289 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8290 | |
8291 Interpolate Q main values, generate interpolated W main values on the fly from | |
8292 Q main values. | |
8293 | |
8294 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8295 (getGaugeDatum): removed, obsolete | |
8296 (getLocation): new, gets location | |
8297 Use WstValueTable to look up interpolated Qs of MainValues. In absence of | |
8298 the same functionality for Ws, generate W Main Values from Q Main Values. | |
8299 | |
8300 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8301 | |
8302 Use new helper class FLYSUtils, minor refactorization. | |
8303 | |
8304 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8305 Use new functionality of helper class, convenience of FLYSArtifact. | |
8306 | |
8307 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8308 | |
8309 Refactored to use new Helper class FLYSUtils, moved getRiver-functionality | |
8310 in there. | |
8311 | |
8312 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getRiver): | |
8313 New function to retrieve river of an artifact, slightly modified from | |
8314 WINFOArtifact. | |
8315 | |
8316 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8317 Removed implementations of getRiver, update calls to use FLYSUtils. | |
8318 | |
8319 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8320 | |
8321 Minor cosmetics. | |
8322 | |
8323 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8324 Resolved a TODO. | |
8325 | |
8326 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
8327 Added some documentation. | |
8328 | |
8329 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
8330 Minor cosmetic. | |
8331 | |
8332 2011-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8333 | |
8334 * doc/conf/meta-data.xml: Made it Oracle compatible. | |
8335 | |
8336 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
8337 If running in debug mode log executed statements. | |
8338 Helps debugging Oracle connections. | |
8339 | |
8340 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8341 | |
8342 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8343 Set some WSPLGENJob parameters which are stored at FLYSArtifact. | |
8344 | |
8345 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8346 | |
8347 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New. This helper | |
8348 class should provide some basic FLYS stuff. Currently, there are functions | |
8349 that return the km range/location. | |
8350 | |
8351 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
8352 the methods that return the km range/locations. This is implemented in | |
8353 FLYSUtils now. | |
8354 | |
8355 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8356 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8357 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Adapted | |
8358 the WINFO method calls to retrieve the km range/locations - call | |
8359 FLYSUtils now. | |
8360 | |
8361 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8362 | |
8363 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New method | |
8364 to destroy a single state. | |
8365 | |
8366 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8367 | |
8368 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8369 Cosmetic, remove debug output and comments, minor style adjustments. | |
8370 | |
8371 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8372 | |
8373 Added limited themeing-support for MainValues. | |
8374 | |
8375 * doc/conf/themes.xml: | |
8376 Added Q/W-MainValues themes. | |
8377 | |
8378 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8379 Added limited theming support, add legend entry for main values. | |
8380 | |
8381 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8382 | |
8383 * doc/conf/conf.xml: Added a configuration node that points to the directory | |
8384 where shapefiles should be stored in. | |
8385 | |
8386 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: New. | |
8387 This class is used to save/write the parameter for a WSPLGEN calculation. | |
8388 WSPLGEN's *.par files are written using the toFile() method. | |
8389 | |
8390 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8391 A directory for all WSPLGEN stuff is created in computeAdvance() - those | |
8392 directory and all its contained files are removed in endOfLife(). | |
8393 | |
8394 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8395 | |
8396 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
8397 New Util to work with theme-related stuff. | |
8398 | |
8399 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8400 | |
8401 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8402 Use NamedDoubles instead of MainValues, try to adjust scale of Ws. | |
8403 | |
8404 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8405 Use NamedDoubles instead of MainValues, generalize annotation handling, to | |
8406 allow easier reusability and themeing. | |
8407 | |
8408 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8409 Added convenience constructor, exemplary switch on bordered text. | |
8410 | |
8411 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8412 | |
8413 * doc/conf/meta-data.xml: | |
8414 Recommend MainValues for Computed discharge curves. | |
8415 | |
8416 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8417 | |
8418 New NamedDouble class which implements a <String,double>-pair. | |
8419 | |
8420 * src/main/java/de/intevation/flys/artifacts/model/NamedDouble.java: | |
8421 New, implementation of a double with a string or vice versa. | |
8422 | |
8423 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8424 | |
8425 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
8426 State.endOfLife() for all States when endOfLife() of the Artifact is | |
8427 called. | |
8428 | |
8429 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8430 | |
8431 Also plot "W"-MainValues (on vertical axis), take correct parameters, but | |
8432 do not convert to correct scale (cm vs NN+m). | |
8433 | |
8434 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8435 Naive attempt at allowing the vertical axis to be sticked at. | |
8436 | |
8437 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8438 Store Q and W MainValues separately, add them to plot as annotations. | |
8439 | |
8440 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8441 Serve the MainValues, parameterized on river and location, Q and W. | |
8442 Removed Facet-implementation. | |
8443 | |
8444 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8445 Updated Facet Types. | |
8446 | |
8447 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: | |
8448 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
8449 New, trivial facets, extracted from MainValuesArtifact. | |
8450 | |
8451 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
8452 | |
8453 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
8454 State.endOfLife() of each State that is no longer in the queue of the | |
8455 artifact when this artifact steps back to a previous state. | |
8456 | |
8457 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8458 | |
8459 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8460 Plot MainValues delivered by MainValuesFacet in much the same ways than | |
8461 Annotations in LongitudinalSection plots. | |
8462 | |
8463 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8464 | |
8465 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8466 Prepare further differentiation between Annotations that stick to X or Y- | |
8467 Axis, copied some positioning logic into StickyAxisAnnotation | |
8468 implementation. | |
8469 | |
8470 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8471 | |
8472 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
8473 Minor cosmetics. | |
8474 | |
8475 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8476 | |
8477 Added MainValue-Fetching-Capabilities to MainValuesArtifact. | |
8478 | |
8479 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8480 (initialize, getMinValues): | |
8481 Let MainValuesArtifact return "real" MainValues, although ignorant of all | |
8482 parameterization. | |
8483 | |
8484 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8485 | |
8486 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8487 (MainValueFacet): | |
8488 Improved and straightened implementation, added code-Annotations and Todos. | |
8489 | |
8490 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8491 | |
8492 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8493 (MainValueFacet): | |
8494 Improved and straightened implementation, added code-Annotations and Todos. | |
8495 | |
8496 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8497 | |
8498 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
8499 (getState): | |
8500 Resolved multiple creation of state (yet not very clean). | |
8501 | |
8502 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8503 | |
8504 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
8505 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8506 Cosmetics, docs. | |
8507 | |
8508 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8509 Cosmetics. | |
8510 | |
8511 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8512 | |
8513 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
8514 Added new (MainValues) Facet-Type. | |
8515 | |
8516 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8517 | |
8518 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
8519 Added a method that returns a River object based on its database id. | |
8520 | |
8521 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: The | |
8522 data that is required for this artifact is fetched from database instead | |
8523 from a Master-Artifact. The creation of static artifacts should use | |
8524 database ids instead of cloning a Master-Artifact. | |
8525 | |
8526 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8527 | |
8528 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8529 Removed needless imports. | |
8530 | |
8531 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8532 | |
8533 Added configuration for factory and rule for MainValueArtifacts. | |
8534 | |
8535 * doc/conf.xml: | |
8536 Add a mainvalue factory to serve MainValueArtifacts. | |
8537 | |
8538 * doc/conf/meta-data.xml: | |
8539 Recomment mainvalue artifact when computed_discharge_curve can be put out. | |
8540 | |
8541 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8542 | |
8543 Let MainValuesArtifact have a state, outputmode and facet. | |
8544 | |
8545 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
8546 New, a non-abstract DefaultState. | |
8547 | |
8548 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8549 Progressed with implementation, use StaticState to hook output modes and | |
8550 facet in; use (Static)FLYSArtifact implementation. | |
8551 | |
8552 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8553 | |
8554 Smaller cosmetics. | |
8555 | |
8556 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
8557 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
8558 Cosmetics in comments. | |
8559 | |
8560 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8561 Added @Override annotations. | |
8562 | |
8563 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
8564 Use brackets to improve readability of ternary operator. | |
8565 | |
8566 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8567 | |
8568 * doc/conf/meta-data.xml: Use "ids" in user specific part, too. | |
8569 | |
8570 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8571 | |
8572 * doc/conf/meta-data.xml: s/db-ids/ids/g to unify system and user specific | |
8573 loading. | |
8574 | |
8575 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8576 | |
8577 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
8578 Extracted access to state and states in order to have fewer places to | |
8579 modify when going for single/trivial state- artifacts. | |
8580 | |
8581 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8582 | |
8583 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
8584 Append the river's srid to the WMSLayerFacet. | |
8585 | |
8586 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8587 | |
8588 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8589 Minor fixes, ressurect Facet implementation as inner class. | |
8590 | |
8591 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8592 | |
8593 * doc/conf/artifacts/winfo.xml: Moved the input of barriers one state | |
8594 earlier where the scenario is selected as well. | |
8595 | |
8596 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
8597 This state now desires the "map_digitize" UI provider and returns both | |
8598 items "scenario" and "uesk.barriers" in the dynamic describe part. | |
8599 | |
8600 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8601 Removed the UI provider and the computeFeed() which is no longer needed, | |
8602 because there is no more user input in this state. | |
8603 | |
8604 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
8605 | |
8606 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
8607 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
8608 Repaired broken xpath expressions (the config changed in one of the last | |
8609 commits) and make use of the variable support in xpath expressions to | |
8610 replace the rivername. | |
8611 | |
8612 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
8613 Save the rivername while initializing this artifact. This is now | |
8614 necessary, because each river can have its own background wms | |
8615 configured. | |
8616 | |
8617 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
8618 | |
8619 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
8620 Repaired broken river-wms initialization. | |
8621 | |
8622 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8623 | |
8624 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java, | |
8625 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
8626 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
8627 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java, | |
8628 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
8629 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
8630 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, | |
8631 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
8632 src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
8633 Made facets cloneable with the right type. | |
8634 | |
8635 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, | |
8636 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8637 Removed superfluous imports. | |
8638 | |
8639 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
8640 | |
8641 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
8642 Declare the first artifact of an output as master artifact (artifacts | |
8643 are ordered by their creation time). | |
8644 | |
8645 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8646 | |
8647 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8648 Removed facet interface. | |
8649 | |
8650 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
8651 Make artifacts cloneable. TODO: Override deepCopy() in subclassed | |
8652 states and facets. | |
8653 | |
8654 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
8655 | |
8656 * doc/conf/conf.xml: Added the MapInfoService and adapted the floodmap | |
8657 configuration. Now, each river can have its own background wms layer | |
8658 defined. | |
8659 | |
8660 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
8661 New. This service returns some basic information used to create maps for | |
8662 a specific river. The name of the desired river needs to be defined at | |
8663 "/mapinfo/river/text()". | |
8664 | |
8665 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
8666 Adapted an xpath expression that points to the srid of a river in the | |
8667 floodmap configuration (which changed). | |
8668 | |
8669 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8670 | |
8671 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
8672 Build out/facet filter from XML document passed at creation time. | |
8673 | |
8674 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8675 | |
8676 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
8677 Added some code to filter outs/facets by an optional positive list. | |
8678 This is needed to only expose parts of the facets. This | |
8679 is needed for artifacts which are loaded into a collection. | |
8680 TODO: create the filter from the XML document passed at creation | |
8681 time. | |
8682 | |
8683 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8684 | |
8685 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved all | |
8686 WINFO specific code to WINFOArtifact. FLYSArtifact is now only revolving | |
8687 about state affairs. | |
8688 | |
8689 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-inserted | |
8690 the specific stuff here. | |
8691 | |
8692 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8693 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
8694 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
8695 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
8696 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
8697 src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
8698 Adjusted the casts. | |
8699 | |
8700 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8701 | |
8702 * doc/conf/meta-data.xml: Filter by outs in user template part. | |
8703 | |
8704 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
8705 | |
8706 * doc/conf/artifacts/winfo.xml: Defined an input value for the GeoJSON | |
8707 string to save user defined barriers in the map. | |
8708 | |
8709 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
8710 Added a computeFeed() method. In addition, this state now prefers the | |
8711 "noinput" UI provider. | |
8712 | |
8713 2011-08-19 Ingo Weinzierl <ingo@intevation.de> | |
8714 | |
8715 * doc/conf/conf.xml: Each river requires a SRID definition. This | |
8716 definition is used to transform the river's geometries into the desired | |
8717 projection. | |
8718 | |
8719 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
8720 This facets are able to save a SRID. | |
8721 | |
8722 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
8723 The extent that is written into the WMSLayerFacet is determined by the | |
8724 boundary of the geometry. | |
8725 | |
8726 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New. A | |
8727 utility class that provides helper functions for geometries. Currently, | |
8728 one function is defined, that creates a boundary string for OpenLayers. | |
8729 | |
8730 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8731 | |
8732 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8733 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
8734 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
8735 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
8736 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
8737 src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
8738 Removed superfluous imports. | |
8739 | |
8740 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8741 | |
8742 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
8743 Removed CallContext from state validation. It is not needed and hindered | |
8744 the extraction of all out of an artifact if you don't have a | |
8745 call context (like initial scan of datacage database). | |
8746 | |
8747 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
8748 Extract all outs now. | |
8749 | |
8750 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
8751 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
8752 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
8753 src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
8754 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
8755 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
8756 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
8757 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
8758 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
8759 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
8760 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
8761 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
8762 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
8763 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
8764 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
8765 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
8766 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
8767 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
8768 Adjusted calls. | |
8769 | |
8770 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8771 | |
8772 * src/main/resources/messages.properties, | |
8773 src/main/resources/messages_de_DE.properties, | |
8774 src/main/resources/messages_en.properties, | |
8775 src/main/resources/messages_de.properties: | |
8776 Added lacalization of "Streckenfavoriten". | |
8777 | |
8778 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8779 | |
8780 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
8781 Picky white-space cosmetics. | |
8782 | |
8783 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8784 | |
8785 Added stub implementation of new MainValuesArtifact. | |
8786 | |
8787 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
8788 New. Stub implementation for new MainValuesArtifact. | |
8789 | |
8790 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8791 | |
8792 Fixed flys/issue262 | |
8793 | |
8794 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
8795 Unified user and system tempate. | |
8796 Looks for "/artifact-database/metadata/template/text()" | |
8797 in conf.xml. Defaults to "${artifacts.config.dir}/meta-data.xml". If user id is | |
8798 given its the default connection for contexts. | |
8799 | |
8800 * doc/conf/conf.xml: Adjusted | |
8801 * doc/conf/meta-data-system.xml, doc/conf/meta-data-user.xml: Deleted. | |
8802 * doc/conf/meta-data.xml: Unified version of user and system template. | |
8803 | |
8804 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
8805 Adjusted the test program. | |
8806 | |
8807 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8808 | |
8809 Fixed flys/issue260 | |
8810 | |
8811 * doc/conf/meta-data-user.xml: Uses master_artifacts view now. | |
8812 | |
8813 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8814 | |
8815 * doc/conf/datacage.sql: Added view master_artifacts to select | |
8816 the master artifacts of the collections more easily. | |
8817 To upgrade existing database: | |
8818 | |
8819 CREATE VIEW master_artifacts AS | |
8820 SELECT a2.id AS id, | |
8821 a2.gid AS gid, | |
8822 a2.state AS state, | |
8823 a2.creation AS creation, | |
8824 ci2.collection_id AS collection_id | |
8825 FROM collection_items ci2 | |
8826 JOIN artifacts a2 | |
8827 ON ci2.artifact_id = a2.id | |
8828 JOIN (SELECT ci.collection_id AS c_id, | |
8829 MIN(a.creation) AS oldest_a | |
8830 FROM collection_items ci | |
8831 JOIN artifacts a | |
8832 ON ci.artifact_id = a.id | |
8833 GROUP BY ci.collection_id) o | |
8834 ON o.c_id = ci2.collection_id | |
8835 WHERE a2.creation = o.oldest_a; | |
8836 | |
8837 TODO: Use the view in the templates. | |
8838 | |
8839 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8840 | |
8841 * doc/conf/meta-data-user.xml: Removed state filter because it was broken. | |
8842 Simplified by joining two contexts. | |
8843 | |
8844 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8845 | |
8846 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8847 Fix issues with lines of annotation when zoomed (wrong scale used). | |
8848 | |
8849 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8850 | |
8851 Added legend for annotations to LongitudinalSectionDiagram. | |
8852 | |
8853 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8854 Added a pseudo-dataseries/collection to employ existing infrastructure for | |
8855 displaying localized label for Annotations (yet unthemed). | |
8856 | |
8857 * src/main/resources/messages.properties, | |
8858 src/main/resources/messages_de_DE.properties, | |
8859 src/main/resources/messages_en.properties, | |
8860 src/main/resources/messages_de.properties: | |
8861 Made label-string available for localization. | |
8862 | |
8863 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8864 | |
8865 Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . | |
8866 | |
8867 * src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
8868 Deleted/moved to src/main/java/de/intevation/flys/jfree/ . | |
8869 | |
8870 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
8871 New/moved from src/main/java/de/intevation/flys/export/ , adjusted | |
8872 package statement, made class public. | |
8873 | |
8874 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8875 Added import statement for de.intevation.flys.jfree.StickyAxisAnnotation . | |
8876 | |
8877 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8878 | |
8879 Extracted and renamed CustomAnnotation to StickyAxisAnnotation. Also removed | |
8880 needless imports. | |
8881 | |
8882 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
8883 src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
8884 Extracted class implementation CustomAnnotation and renamed to | |
8885 StickyAxisAnnotation. | |
8886 | |
8887 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8888 | |
8889 Improved CustomAnnotations and rendering thereof, now including an | |
8890 "axis mark" (little line at axis), also prepared possibility to put | |
8891 annotations on Y-axis. | |
8892 | |
8893 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8894 Improved CustomAnnotation to include marks on the axis and better spacing | |
8895 from it. | |
8896 | |
8897 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8898 | |
8899 Implemented proof-of-concept collision-detection when drawing | |
8900 CustomAnnotations (text only). | |
8901 | |
8902 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
8903 Pass a fresh ChartRenderingInfo-Object to createBufferedImage, such that | |
8904 information can be collected while rendering. | |
8905 | |
8906 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8907 Exploit the fact that XYTextAnnotation already registers drawn shape in the | |
8908 ChartRenderingInfo if it exists and either an URL or tooltip is set. | |
8909 Before drawing, calculate own shape and compare against already registered | |
8910 shapes. | |
8911 | |
8912 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8913 | |
8914 Implemented (yet dummy) custom Annotation class. | |
8915 | |
8916 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8917 Added implementation of yet dummy CustomAnnotation class. | |
8918 | |
8919 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8920 | |
8921 Slightly improved rendering of annotations. | |
8922 | |
8923 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8924 Slightly improved rendering of annotations. Still no valid collision | |
8925 detection. Annotations are drawn every 2 km; first come first serve. | |
8926 | |
8927 2011-08-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8928 | |
8929 Fix for flys/issue191 | |
8930 | |
8931 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(longestIncreasingWRangeIndices): | |
8932 Added a method to find the longest index range with increasing w values. | |
8933 | |
8934 * src/main/java/de/intevation/flys/exports/ATWriter.java: Export the longest | |
8935 range of monotone increasing w values instead of the first one. | |
8936 TODO: The first line of the export is still broken. | |
8937 | |
8938 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8939 Removed superfluous import. | |
8940 | |
8941 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8942 | |
8943 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
8944 Resolved two TODOs: get Annotations of selected River, get "point" | |
8945 Annotations only. | |
8946 | |
8947 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8948 | |
8949 Added functionality to query range and point-annotations only to | |
8950 AnnotationFactory. | |
8951 | |
8952 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java | |
8953 (getPointAnnotations, getAnnotationsBreadth): | |
8954 New functions to query breadth and point-only annotations. | |
8955 | |
8956 2011-08-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8957 | |
8958 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
8959 Added a development mode for recommendations. Enabled with | |
8960 stetting system property 'flys.datacage.recommendations.development' to true. | |
8961 When set the XML template are re-read if the timestamps of the | |
8962 files have changed so you do not have to restart the server again and again. | |
8963 | |
8964 * doc/conf/meta-data-user.xml: Sort collections by creation time in descending order. | |
8965 | |
8966 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8967 | |
8968 Rather picky cosmetics only. | |
8969 | |
8970 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
8971 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
8972 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
8973 src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java, | |
8974 src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
8975 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
8976 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
8977 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
8978 End comments on a full stop, separate from closing '*/' by whitespace, | |
8979 adjusted javadoc comments. | |
8980 | |
8981 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8982 | |
8983 Made Annotations visible in LongitudinalSection diagrams. | |
8984 | |
8985 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, | |
8986 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
8987 Register new Facet Type, let LongitudinalSectionGenerator include | |
8988 Annotations in diagram (yet unfiltered and independent of river). | |
8989 | |
8990 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8991 | |
8992 * doc/conf/conf.xml, | |
8993 doc/conf/artifacts/annotation.xml, | |
8994 doc/conf/meta-data-system.xml: | |
8995 Added configuration for AnnotationArtifacts. | |
8996 | |
8997 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
8998 | |
8999 Added demo- implementation of a AnnotationArtifact and its Facet. | |
9000 | |
9001 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
9002 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
9003 src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: | |
9004 New. Initial version of an AnnotationArtifact and its State and Facet. | |
9005 | |
9006 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9007 | |
9008 * doc/conf/datacage.sql: Extended schema for artifacts and collections | |
9009 to have creation times, too. | |
9010 | |
9011 To update existing databases: | |
9012 | |
9013 ALTER TABLE artifacts ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
9014 ALTER TABLE collections ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
9015 | |
9016 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9017 Store creation times for artifacts and collections, too. | |
9018 | |
9019 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9020 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9021 Adjusted SQL statements. | |
9022 | |
9023 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9024 | |
9025 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9026 Make it compilable again (BackendListener interface changed). | |
9027 | |
9028 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9029 | |
9030 * doc/conf/meta-data-user.xml: Added grouping element around w/q of each | |
9031 longitudinal section artifact. | |
9032 | |
9033 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java, | |
9034 src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java: | |
9035 Added some debugging capabilities. | |
9036 | |
9037 * src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
9038 Added isEmpty() method. | |
9039 | |
9040 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9041 Now it is possible to nest <dc:elements> into other elements in the <dc:context> | |
9042 body. This is useful and needed for grouping and repeating results. | |
9043 | |
9044 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9045 | |
9046 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9047 User connection was cached, system was not. Lead to incorrect results. | |
9048 | |
9049 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9050 | |
9051 * doc/conf/meta-data-user.xml: Added <old_calculations> element | |
9052 around old calculations. | |
9053 | |
9054 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9055 | |
9056 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
9057 Cosmetic: Replaced usage of legacy java.util.Stack with java.util.Deque. | |
9058 | |
9059 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9060 | |
9061 * doc/conf/meta-data-user.xml: Use 'CAST(x AS uuid)' instead of 'x::uuid' | |
9062 to be more compatible. | |
9063 | |
9064 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9065 | |
9066 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9067 If given an artifact place its identifier into parameters passed to template. | |
9068 Fixed swapped user/system connections if using the user template. | |
9069 | |
9070 * doc/conf/meta-data-user.xml: Recommend w/q facet from old calculations | |
9071 if an artifact was given that represents a longitudinal section | |
9072 "Laengsschnitt". | |
9073 | |
9074 TODO I: The template uses PostgreSQL specific UUID casts. | |
9075 TODO II: We need to find a way only to recommend the master artifacts. | |
9076 | |
9077 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9078 | |
9079 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9080 Added a <dc:comment> tag to place comments in the meta data templates. | |
9081 <!-- ... --> comments are copied through. | |
9082 | |
9083 * doc/conf/meta-data-user.xml: Added a simple test. | |
9084 | |
9085 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9086 | |
9087 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9088 Be a bit more tolerant about empty strings for UUIDs of artifact and user. | |
9089 | |
9090 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9091 | |
9092 Bring user specific meta data service to life. | |
9093 | |
9094 * doc/conf/conf.xml: There are now two templates to configure: | |
9095 The system template (only the data from the backend) and the | |
9096 user template (the datcage db and the backend db), | |
9097 | |
9098 * doc/conf/meta-data-template.xml: Deleted. | |
9099 * doc/conf/meta-data-user.xml: New. The user specific template. TODO: Write it! | |
9100 * doc/conf/meta-data-system.xml: New. The system template. | |
9101 | |
9102 * src/main/java/de/intevation/flys/artifacts/datacage/templating/NoneUserSpecific.java: | |
9103 Deleted. | |
9104 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
9105 New. The logic to fill the templates. | |
9106 | |
9107 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
9108 Adjusted to follow the new call signatures. | |
9109 | |
9110 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9111 Refactored. Removed the old code and only leave the new service. Following | |
9112 XPaths are evaluated on the incomming document: | |
9113 | |
9114 "/art:meta/art:artifact-id/@value" The UUID of the artifact. Optional. | |
9115 Used to fill the template enviroment. | |
9116 "/art:meta/art:user-id/@value" The UUID of the user. Optional. | |
9117 If given the user specific template is filled. | |
9118 "/art:meta/art:outs/@value" The list of outs used to recommend for the | |
9119 various outputs. | |
9120 "/art:meta/art:parameters/@value" A list of key/value pairs to inject more | |
9121 filters to the templating. | |
9122 | |
9123 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
9124 Change to follow the new recommendations semantics. | |
9125 | |
9126 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9127 Added symbolic constants to distinguish "user" and "system" db connections. | |
9128 | |
9129 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9130 | |
9131 * doc/conf/conf.xml: | |
9132 Cosmetics, let comments start with a capital and end on a full stop, | |
9133 removed incorrect comment. | |
9134 | |
9135 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9136 | |
9137 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9138 Cosmetics, let comments start with a capital and end on a full stop. | |
9139 | |
9140 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9141 | |
9142 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java(extractOutputNames): | |
9143 Fixed potential NPE. | |
9144 | |
9145 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9146 | |
9147 Added support for more than one db connection in datacage templating. | |
9148 | |
9149 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
9150 Now you can pass a list of named db connections to the build process. | |
9151 The purpose is to mix more then one database (e.g. the backend db and | |
9152 the user specific one). | |
9153 | |
9154 To use this feature you can add an "connection" attribute | |
9155 to <dc:context> with the name of the connection to use. | |
9156 If no connection name is given the last used is used again. | |
9157 Initially the first connection in the given list is used. | |
9158 If the context is left the connection that was active before | |
9159 will be active again in a stacking manner. | |
9160 | |
9161 When creating NamedConnection objects you can set a boolean flag | |
9162 if the results coming from the connection should be cached. This | |
9163 is useful e.g. for the user specific database which runs in-memory | |
9164 so caching would introduce some superfluous overhead. | |
9165 | |
9166 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
9167 When executing the queries explicitly pass if caching should be used. | |
9168 | |
9169 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9170 | |
9171 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9172 Forgot to fetch dialect dependent SQL statement for deleting | |
9173 artifacts by uuid. | |
9174 | |
9175 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9176 | |
9177 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9178 Set the name of the collections at initial scan, too. | |
9179 | |
9180 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9181 | |
9182 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9183 Fixed wrong SQL references. | |
9184 | |
9185 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9186 | |
9187 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9188 Fixed two NPEs. | |
9189 | |
9190 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9191 | |
9192 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java, | |
9193 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9194 Forwarded kill collections and artifacts events to datacage. | |
9195 | |
9196 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9197 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9198 Added statement to delete artifact by uuid. | |
9199 | |
9200 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9201 | |
9202 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9203 Made it compilable again. The signature of BackendListener has changed. | |
9204 | |
9205 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9206 | |
9207 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9208 Completed the backend listener stuff. | |
9209 | |
9210 TODO I: Added some cleanup for orphaned artifacts. | |
9211 TODO II: Figure out a way to delete collections/artifacts | |
9212 which are delete from backend without the | |
9213 backend API. | |
9214 | |
9215 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9216 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9217 Added needed statements. | |
9218 | |
9219 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9220 | |
9221 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9222 Update collection names on change. Remove artifacts from collections. | |
9223 | |
9224 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
9225 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9226 Added needed statements. | |
9227 | |
9228 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9229 | |
9230 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9231 Call datacage with the global context. This is needed to access the state engine. | |
9232 | |
9233 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: Changed | |
9234 signatures to take the global context, too. Create artifacts via backend listener | |
9235 interface. | |
9236 | |
9237 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9238 | |
9239 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9240 Fixed recursion bug. | |
9241 | |
9242 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9243 | |
9244 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9245 Added debug output. | |
9246 | |
9247 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9248 | |
9249 * doc/conf/conf.xml: Added backend listener for datacage. | |
9250 | |
9251 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
9252 New. Proxies backend listener calls to datacage. | |
9253 | |
9254 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9255 Implements backend listener. TODO: Update the datacage database | |
9256 according the change calls. | |
9257 | |
9258 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9259 | |
9260 * src/main/java/de/intevation/flys/artifacts/services/meta, | |
9261 src/main/java/de/intevation/flys/artifacts/datacage/templating: | |
9262 Moved/renamed package to better fit the common semantics. | |
9263 DataCage.java is now call NoneUserSpecific.java to reflect the | |
9264 fact that it is the template for the user independent db | |
9265 analysis. | |
9266 | |
9267 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, | |
9268 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9269 Ajusted imports and calls. | |
9270 | |
9271 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9272 | |
9273 * doc/conf/conf.xml: For documentation purposes added a out-commented | |
9274 section with the default configuration of the datacage. | |
9275 | |
9276 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9277 | |
9278 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9279 Delete the artifacts at before initial scan, too. They are independent | |
9280 from users. Fixed problem when writing state data content. | |
9281 | |
9282 * src/main/resources/datacage-sql/org-h2-driver.properties: Added | |
9283 statement to delete the artifacts at initial scan, too. | |
9284 | |
9285 * src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
9286 New. PostgreSQL version of the statements. The database scheme | |
9287 is the same as H2. Very useful for debugging. | |
9288 | |
9289 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9290 | |
9291 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9292 Added kludge for the types of artifact data. They seem to be null | |
9293 in some circumstances. Needs to be debugged! | |
9294 | |
9295 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9296 | |
9297 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
9298 Fixed default connection URL to use a namend in-mermory database. | |
9299 | |
9300 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9301 | |
9302 * doc/conf/datacage.sql: Fixed constraint. | |
9303 | |
9304 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9305 Added some debug output. | |
9306 | |
9307 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9308 | |
9309 * doc/conf/datacage.sql: Removed artifact_id from facet because there | |
9310 is a link via out_id -> outs.id: artifact_id -> artifacts to | |
9311 find the corresponding artifact. | |
9312 | |
9313 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9314 src/main/resources/datacage-sql/org-h2-driver.properties: Store | |
9315 facets of outs into datacage db at initial scan. | |
9316 | |
9317 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9318 | |
9319 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9320 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9321 Store outs of artifacts into datacage db at initial scan. | |
9322 TODO: store facets. | |
9323 | |
9324 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9325 | |
9326 * doc/conf/datacage.sql: Added 'type' column in artifacts data. | |
9327 Maybe useful for filtering. | |
9328 | |
9329 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9330 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9331 Store artifact data into db at initial scan. | |
9332 TODO: store outs and facets. | |
9333 | |
9334 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9335 | |
9336 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9337 src/main/resources/datacage-sql/org-h2-driver.properties: | |
9338 Add artifacts into datacage db at initial scan. | |
9339 TODO: Store data, outs and facets. | |
9340 | |
9341 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9342 | |
9343 * doc/conf/datacage.sql: Fixed spelling in sequence name. | |
9344 | |
9345 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9346 src/main/resources/datacage-sql/org-h2-driver.properties: Simply add | |
9347 collection item at initial scan if artifact was stored before. | |
9348 TODO: Store new artifacts. | |
9349 | |
9350 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9351 | |
9352 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9353 src/main/resources/datacage-sql/org-h2-driver.properties: Add | |
9354 collections at initial scan. | |
9355 | |
9356 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9357 | |
9358 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9359 src/main/resources/datacage-sql/org-h2-driver.properties: Add users | |
9360 at initial scan. | |
9361 | |
9362 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9363 | |
9364 * doc/conf/datacage.sql: Using sequences for id generation now | |
9365 to make schema more compatible. | |
9366 | |
9367 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9368 | |
9369 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
9370 src/main/resources/datacage-sql/org-h2-driver.properties: Clear database | |
9371 before initial scan. | |
9372 | |
9373 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9374 | |
9375 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
9376 Deleted. This stuff comes from the artifact database now. | |
9377 | |
9378 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
9379 New. The db config of the datacage database. | |
9380 | |
9381 * src/main/resources/datacage-sql/org-h2-driver.properties: New. | |
9382 The SQL statements needed for the datacage. | |
9383 | |
9384 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9385 Make use of the db config. | |
9386 | |
9387 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9388 | |
9389 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
9390 New. A artifact database lifetime listener to build the initial | |
9391 index of the artifacts in database. | |
9392 | |
9393 * doc/conf/conf.xml: Added the datacage to the list of lifetime | |
9394 listeners. | |
9395 | |
9396 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9397 | |
9398 * doc/conf/datacage.sql: Added an explicit table for the outs | |
9399 of an artifact. | |
9400 | |
9401 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9402 Make the current outs of an artifact accessible only with | |
9403 the global context. | |
9404 | |
9405 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9406 | |
9407 * doc/conf/datacage.sql: Added ON DELETE CASCADE constraints. | |
9408 Added state in facet. | |
9409 | |
9410 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9411 | |
9412 * doc/conf/datacage.sql: New. H2 Schema for the datacage database. | |
9413 Uses special features like IDENTITY (autoincrement) typed columns. | |
9414 | |
9415 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
9416 Pooled connection. | |
9417 | |
9418 * pom.xml: Added dependencies to H2 and Apache DBCP. | |
9419 | |
9420 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9421 | |
9422 * src/test/java/de/intevation/flys/artifacts/AppTest.java, | |
9423 src/main/java/de/intevation/flys/artifacts/App.java: Removed. | |
9424 This the stupid "Hello, World!" app initially created by the | |
9425 maven archetype. It was never used. | |
9426 | |
9427 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9428 | |
9429 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9430 Argh! Usage the DOM was not thread safe (discovered with ab). | |
9431 | |
9432 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9433 | |
9434 * doc/conf/meta-data-template.xml: '$recommended' lead to XPath | |
9435 errors. Using "dc:contains($parameters, 'recommended')" helps. | |
9436 | |
9437 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java, | |
9438 src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
9439 Added some debugging. | |
9440 | |
9441 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9442 Added parameters as 'parameters' to parameters. Usefull to check | |
9443 for containment of variables. | |
9444 | |
9445 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9446 | |
9447 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9448 Added 'if log.isDebugEnabled() {}'. | |
9449 | |
9450 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9451 | |
9452 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9453 Made Artifact UUID optional and accept extra parameters, too. This enables | |
9454 the service to be used without an arttifact and test all filters. | |
9455 | |
9456 <art:meta xmlns:art="http://www.intevation.de/2009/artifacts"> | |
9457 <art:outs value="computed_discharge_curve,floodmap"/> | |
9458 <art:parameters value="river:Elbe"/> | |
9459 <art:filters value="recommended"/> | |
9460 </art:meta> | |
9461 | |
9462 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
9463 'contain' accept Maps and collection, too. | |
9464 | |
9465 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9466 Made artifact option (= null) in recommendations. | |
9467 | |
9468 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9469 | |
9470 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9471 Moved connection specific into inner class. The enables the reuse of the | |
9472 compiled statement. | |
9473 | |
9474 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: The | |
9475 SQL statements are now only compiled once at creation time of the builder. | |
9476 Each connection now reuses them. | |
9477 | |
9478 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9479 | |
9480 * doc/conf/cache.xml: Added configuration for static datacage db access. | |
9481 | |
9482 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: Using | |
9483 caches seems to need an explicit System.exit(). | |
9484 | |
9485 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9486 Added support for caching the SQL statements and there results. | |
9487 | |
9488 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: Some | |
9489 clean up. Reordered code for performance. Strip SQL statements more | |
9490 aggressively. | |
9491 | |
9492 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
9493 Made it Serializable. | |
9494 | |
9495 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
9496 Introduced system property 'flys.artifacts.cache.config.file' to make | |
9497 the caching configurable without pulling up the whole stack. | |
9498 | |
9499 2011-07-22 Ingo Weinzierl <ingo@intevation.de> | |
9500 | |
9501 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9502 Prepared the FLYSArtifactCollection to support the storage of already | |
9503 loaded recommendations in its attribute document. | |
9504 | |
9505 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9506 | |
9507 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9508 Adjusted to use the DataCage recommendations. The incomming document | |
9509 can pass the artifacts UUID by '/art:outs/@value' the outs as a | |
9510 comma separated list in '/art:outs/@value' and optional a set of | |
9511 filters comma separated in '/art:filters/@value'. | |
9512 | |
9513 If UUID and OUTS are not given the old service is used. This | |
9514 should be removed as soon as the client uses the new service. | |
9515 | |
9516 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9517 | |
9518 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
9519 Allow '-' in variable names. | |
9520 | |
9521 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9522 | |
9523 * doc/conf/meta-data-template.xml: Now, the river-id is really added to | |
9524 the factory node of the wmsbackground layer. | |
9525 | |
9526 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9527 | |
9528 * doc/conf/meta-data-template.xml: Added the river-id to the factory node | |
9529 of the riveraxis and wmsbackground layer. | |
9530 | |
9531 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9532 | |
9533 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
9534 src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
9535 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
9536 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
9537 Adjusted to implement changed Service interface. | |
9538 | |
9539 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9540 | |
9541 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Refactored | |
9542 the method that retrieves the Outputs for the Artifact. Now, we are able | |
9543 to query the Outputs for the current state, and all outputs separately. | |
9544 | |
9545 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: The | |
9546 recommendations provided by this monitor will take the Outputs of the | |
9547 current state only into account. | |
9548 | |
9549 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
9550 | |
9551 * doc/conf/meta-data-template.xml: Added conditions for each output type. | |
9552 Splitted the "floodmap" output into two parts: a recommended one and a | |
9553 complete one. The recommended part will only build the document tree for | |
9554 the recommended artifacts; the complete part will build the whole document | |
9555 tree that is available for a floodmap. | |
9556 | |
9557 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
9558 This Hook now uses the DataCage to generate the recommended artifacts. | |
9559 The output-defaults configurtion is needless now. | |
9560 | |
9561 * doc/conf/output-defaults.xml: Removed. The configuration of recommended | |
9562 artifacts takes place in meta-data-template.xml. | |
9563 | |
9564 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9565 Bugfix: the DataCage didn't start working if its builder was NOT null, | |
9566 but it shouldn't start if the builder IS null. | |
9567 | |
9568 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9569 | |
9570 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9571 Now it is possible to directly pass a Node as a root to the builder. | |
9572 The owning document if fetch by Node.getOwnerDocument(). This is | |
9573 useful if you want to generate the recommendation directly into | |
9574 an already existing document under a given node. | |
9575 | |
9576 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9577 Changed the signature of recommend() to accept a node where to | |
9578 append the recommendations. | |
9579 | |
9580 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9581 | |
9582 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9583 Added a macro mechanism: | |
9584 | |
9585 <dc:macro name="keine-fuenf"> | |
9586 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
9587 </dc:macro> | |
9588 <dc:call-macro name="keine-fuenf"/> | |
9589 <dc:call-macro name="keine-fuenf"/> | |
9590 <dc:call-macro name="keine-fuenf"/> | |
9591 | |
9592 Macros can be defined everywhere in the template | |
9593 with 'macro'. There bodies can contain all valid elements | |
9594 including other 'macro's and 'call-macro's. They are | |
9595 called with their 'name' with 'call-macro'. The control flow | |
9596 is continued inside the body of the called macro and | |
9597 will continue right after the calling 'call-macro' when | |
9598 the macro body is finished. | |
9599 | |
9600 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9601 | |
9602 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9603 Added a new 'if' construct similiar to XSLT: | |
9604 | |
9605 <dc:if test="not(dc:contains($outs, '5'))"> | |
9606 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
9607 </dc:if> | |
9608 | |
9609 The control flow is continued inside the 'if' if the 'test' attribute | |
9610 as an XPath expression on an empty document evalutes to true. | |
9611 Else the inside is skipped. There is no 'else'. Use 'choose'/'otherwise' | |
9612 if you need this. | |
9613 | |
9614 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9615 | |
9616 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9617 Added a recommend() method to generate recommendations for | |
9618 a given artifact, outs and extra parameters. | |
9619 | |
9620 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added | |
9621 method to extract all data at once. | |
9622 | |
9623 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9624 | |
9625 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
9626 New. Custom XPath function provider. Provides | |
9627 'dc:contains(Object [] haystack, Object needle)' by now. Should be | |
9628 useful to check containments in 'out' lists later. | |
9629 | |
9630 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9631 Register the FunctionResolver to the evaluated XPaths. | |
9632 | |
9633 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
9634 Added code to parse | |
9635 "param:a,b,c" to "param" -> new String [] { "a", "b", "c" } to | |
9636 help testing the 'dc:contains' XPath function. | |
9637 | |
9638 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9639 | |
9640 * doc/conf/conf.xml: Added wms configurations for Saar, Mosel and Elbe. | |
9641 Each river supported by FLYS requires such a WMS configuration. A WMS | |
9642 should contain layers for the river axis, buildings, kilometer labels | |
9643 and maybe a background layer as well. | |
9644 | |
9645 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
9646 Added key that is used to store a map of WMS URLs - for each river a | |
9647 WMS URL. | |
9648 | |
9649 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
9650 Parse the river WMS from global configuration. | |
9651 | |
9652 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
9653 Create WMSLayerFacets with URLs based on the river and the river wms | |
9654 configuration stored in the FLYSContext. | |
9655 | |
9656 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
9657 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
9658 Adapted the initialize() signature and the method call of computeInit() | |
9659 which requires a FLYSContext to retrieve the river WMS configurations. | |
9660 | |
9661 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
9662 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
9663 Added the context object parameter to the computeInit() method. | |
9664 | |
9665 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
9666 initialize() with the context object - which is a FLYSContext or a | |
9667 CallContext. | |
9668 | |
9669 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9670 | |
9671 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
9672 Check if builder was created properly before using it. | |
9673 | |
9674 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
9675 Implements now variable provider for XPath expressions. | |
9676 | |
9677 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
9678 Added new choose/when/otherwise construct similiar to XSLT | |
9679 | |
9680 <dc:choose> | |
9681 <dc:when test="$river = 'Mosel'"> | |
9682 <dc:text>Es ist die Mosel.</dc:text> | |
9683 </dc:when> | |
9684 <dc:when test="$river = 'Saar'"> | |
9685 <dc:text>Es ist die Saar.</dc:text> | |
9686 </dc:when> | |
9687 <dc:otherwise> | |
9688 <dc:text>Es ist weder Mosel noch Saar.</dc:text> | |
9689 </dc:otherwise> | |
9690 </dc:choose> | |
9691 | |
9692 A 'choose' block can contain a list of 'when's and an optional | |
9693 'otherwise'. For each 'when' the test attribute is evaluated | |
9694 as an XPath expression on an empty document. The result of | |
9695 the evaluation is taken as a boolean value. If its value is | |
9696 true the control flow is continued inside the corresponding | |
9697 'when' and the other choose elements are not tested. | |
9698 If the value is values the testing continues with the next | |
9699 'when'. If no 'test' expression is evaluated to true, the | |
9700 control flow continues inside the 'otherwise'. If no 'otherwise' | |
9701 is given nothing happens at all. | |
9702 | |
9703 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9704 | |
9705 * doc/conf/conf.xml: Added a config section for floodmaps. Currently, the | |
9706 background layer's url and layername is defined here. | |
9707 | |
9708 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
9709 Read the background layer configuration from conf.xml. Those values are | |
9710 used to create the WMSLayerFacet. | |
9711 | |
9712 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9713 | |
9714 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
9715 The background layer facet will no longer have an extent set. | |
9716 | |
9717 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9718 | |
9719 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
9720 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
9721 Set the extent of the created WMSLayerFacets and i18n its descriptions. | |
9722 | |
9723 * src/main/resources/messages.properties, | |
9724 src/main/resources/messages_de_DE.properties, | |
9725 src/main/resources/messages_en.properties, | |
9726 src/main/resources/messages_de.properties: Added I18N strings for the | |
9727 background an river axis layer. | |
9728 | |
9729 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9730 | |
9731 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
9732 This facet type has a method to set the extent of a WMS layer. The | |
9733 extent is written to the facets XML node in toXML() as well. | |
9734 | |
9735 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9736 | |
9737 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
9738 the signature of setup() which requires a CallMeta parameter now. | |
9739 | |
9740 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
9741 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: Use | |
9742 the CallMeta object retrieved in setup() to call initialize(). It is now | |
9743 able to i18n things. | |
9744 | |
9745 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9746 | |
9747 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: New. | |
9748 Standalone app to debug the datacage template. To use in a maven environment: | |
9749 | |
9750 -Dmeta.data.template=PATH_TO_META_DATA-TEMPLATE.XML \ | |
9751 -Dmeta.data.parameters=river:Mosel \ | |
9752 -Dmeta.data.output=OUTPUT.XML \ | |
9753 -Dflys.backend.user=DB_USER \ | |
9754 -Dflys.backend.password=DB_PASSWORD \ | |
9755 -Dflys.backend.url=DB_CONNECTION_URL \ | |
9756 -Dexec.mainClass=de.intevation.flys.artifacts.services.meta.App | |
9757 | |
9758 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9759 | |
9760 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
9761 New. First step to factor out the "Datenkorb" logic into a service independent | |
9762 singleton. | |
9763 | |
9764 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9765 Uses the "Datenkorb" singleton now. | |
9766 | |
9767 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
9768 | |
9769 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
9770 Removed "index" property, because it is already existing in parent | |
9771 class. | |
9772 | |
9773 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9774 | |
9775 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9776 Improved error handling. | |
9777 | |
9778 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9779 | |
9780 * src/main/resources/metadata/template.xml: Deleted. | |
9781 | |
9782 * doc/conf/meta-data-template.xml: New. Was template.xml | |
9783 | |
9784 * doc/conf/conf.xml: Made meta data template configurable. | |
9785 | |
9786 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
9787 Load template from configuration not from resources. | |
9788 | |
9789 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9790 | |
9791 * src/main/resources/metadata/template.xml: s/[a-z]+-id/db-id/ | |
9792 Make database ids identifiable with unique name "db-id". | |
9793 | |
9794 2011-07-19 Ingo Weinzierl <ingo@intevation.de> | |
9795 | |
9796 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
9797 Override the toXML() method. Subclasses can now write their own XML | |
9798 representation. | |
9799 | |
9800 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
9801 New. This ManagedFacet uses an Element (DOM) to store the information | |
9802 about a facet. The intent of this facet type is to represent a facet | |
9803 stored in an Collection attribute. Different facets can have different | |
9804 attributes that we need to parse, but the only thing ManagedFacets need | |
9805 to do, is to adjust the attributes "active" and "position". So, those | |
9806 values are set directly on the Element, the other attributes aren't | |
9807 touched. | |
9808 | |
9809 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
9810 New. This facet is a wrapper for another facet. This subclass of a | |
9811 ManagedFacet overrides the toXML() method. The XML representation is | |
9812 defined by the inner facet that is stored as member variable. The | |
9813 ManagedFacet specific attributes "artifact", "facet", "pos" and "active" | |
9814 are added manually. | |
9815 | |
9816 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Uses | |
9817 the toXML() method to write a facet node into the attribute document. | |
9818 | |
9819 * src/main/java/de/intevation/flys/collections/AttributeParser.java: Uses | |
9820 the ManagedDomFacet to save the information of a facet which is | |
9821 contained in the attribute part of a Collection's DESCRIBE document. | |
9822 | |
9823 * src/main/java/de/intevation/flys/collections/OutputParser.java: Uses the | |
9824 ManagedFacetAdapter to save a facet, because we want to keep the | |
9825 specific facet to be able to write its specific XML representation into | |
9826 the Collection's DESCRIBE document. | |
9827 | |
9828 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9829 Adapted the XPath of facets stored in the attribute part of the | |
9830 DESCRIBE. | |
9831 | |
9832 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
9833 | |
9834 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
9835 method that returns the Outputs for the Artifact. | |
9836 | |
9837 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
9838 Adapeted the call of OutputParser. | |
9839 | |
9840 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
9841 Simplified the code to read the Outputs of Artifacts. This parser will | |
9842 now longer parse the DESCRIBE documents of the Artifacts, but query the | |
9843 Outputs via FLYSArtifact.getOutputs() directly. | |
9844 | |
9845 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
9846 | |
9847 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
9848 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | |
9849 Adapted the function call of ProtocolUtils.appendOutputModes(). | |
9850 | |
9851 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
9852 Override toXML() to add the URL and layernames to the XML representation | |
9853 of this facet. | |
9854 | |
9855 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
9856 | |
9857 * doc/conf/artifacts/wmsbackground.xml, | |
9858 doc/conf/artifacts/riveraxis.xml: New configurations for an Artifact | |
9859 that is used as background layer in floodmaps, and an artifact that is | |
9860 used as layer showing the river axis in a floodmap. | |
9861 | |
9862 * doc/conf/output-defaults.xml: New file to configure default artifacts | |
9863 for specific output states. E.g. the floodmap state recommends a | |
9864 background layer and a layer displaying the river axis. In suche case, | |
9865 the floodmap state recommends two artifacts for the two layers. | |
9866 | |
9867 * doc/conf/conf.xml: Added new artifacts/artifact-factories and a Hook to | |
9868 monitor artifacts (-> CollectionMonitor.java). | |
9869 | |
9870 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
9871 New. This facet is used to represent a layer in a map. So, this facet | |
9872 stores information about a WMS URL and the layer names provided by this | |
9873 WMS. | |
9874 | |
9875 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
9876 facet types for the wmsbackground and riveraxis. | |
9877 | |
9878 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
9879 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
9880 New. An artifact and its default state. The intent of these classes is | |
9881 to generate WMSLayerFacets which represent background layers in maps. | |
9882 | |
9883 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
9884 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: New. | |
9885 An artifact and its default state. The intent of these classes is to | |
9886 generate WMSLayerFacets which represent layers that display a river | |
9887 axis. | |
9888 | |
9889 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
9890 Added the INIT ComputeType. | |
9891 | |
9892 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
9893 case for the INIT ComputeType while computing data. | |
9894 | |
9895 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
9896 | |
9897 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
9898 Added a method computeInit() which is called to initialize data/facets | |
9899 after an artifact has been created. | |
9900 | |
9901 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Repaired | |
9902 broken XPath. | |
9903 | |
9904 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
9905 | |
9906 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
9907 Removed the code to generate new artifacts. Instead of creating new | |
9908 artifacts automatically, we decided to suggest creating new artifacts | |
9909 from specific types. Therefore, the DESCRIBE document of the artifacts | |
9910 is extended with a node that contains recommended artifact types. | |
9911 | |
9912 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
9913 FLYSArtifacts might be setup with the identifier of an other | |
9914 FLYSArtifact. Subclasses are able to override a method called | |
9915 initialize(Artifact, GlobalContext). This might be helpful to extract | |
9916 required values or clone artifacts. | |
9917 | |
9918 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
9919 | |
9920 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
9921 Adapted the signature of createArtifactContext() - it returns an | |
9922 instance of GlobalContext now. | |
9923 | |
9924 2011-07-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9925 | |
9926 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
9927 Debugged the water fill algorithm. Added a lot of logging. | |
9928 | |
9929 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
9930 Added a text field to give a water level to fill in. | |
9931 | |
9932 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
9933 | |
9934 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
9935 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved code | |
9936 to create the output modes based on the given facets to FLYSArtifact. In | |
9937 addition, FLYSArtifact got a new method that returns a specific input | |
9938 value as string. | |
9939 | |
9940 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: New. | |
9941 This hook monitors the "post-feed" and "post-advance". If the monitored | |
9942 Artifact's state has configured recommended artifacts, this hook will | |
9943 create new Artifacts. | |
9944 | |
9945 TODO: We have to add the UUIDs of the new Artifacts to the DESCRIBE | |
9946 document of the artifact to let the client know, that there are new | |
9947 recommended Artifacts. | |
9948 | |
9949 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: New. | |
9950 This Artifact is the base class for Artifacts, that represent static | |
9951 data. E.g. this could be a decoration theme in a chart or a background | |
9952 layer in the map. | |
9953 | |
9954 * src/main/java/de/intevation/flys/artifacts/states/OutputState.java: New. | |
9955 This state might be used as base class for states, that doesn't require | |
9956 any user input, but only provide static Facets added by a computeFeed() | |
9957 operation. So, subclasses need to implement computeFeed() only. | |
9958 | |
9959 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9960 | |
9961 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
9962 New. Standalone Swing-App to test cross sections from database without the | |
9963 hassles of our complete software stack. Runnable from a maven environment: | |
9964 | |
9965 $ mvn -e \ | |
9966 -Dflys.backend.user=DB_USER \ | |
9967 -Dflys.backend.password=DB_PASSWD \ | |
9968 -Dflys.backend.url=DB_CONNECTION_URL \ | |
9969 -Dexec.mainClass=de.intevation.flys.artifacts.charts.CrossSectionApp \ | |
9970 exec:java | |
9971 | |
9972 You can set the river to be used with the system property 'river'. | |
9973 Defaults to 'Mosel'. | |
9974 | |
9975 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
9976 Removed superfluous imports. | |
9977 | |
9978 2011-07-13 Ingo Weinzierl <ingo@intevation.de> | |
9979 | |
9980 * doc/conf/artifacts/winfo.xml: The FloodMapState has a new Outputmode | |
9981 called "floodmap" now. | |
9982 | |
9983 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: New. | |
9984 This facet is used to generate WSPLGEN results. | |
9985 | |
9986 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
9987 the WSPLGENFacet. | |
9988 | |
9989 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
9990 This state will now generate WSPLGENFacets. | |
9991 | |
9992 2011-07-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9993 | |
9994 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
9995 Fixed corner case. | |
9996 | |
9997 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
9998 | |
9999 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: New. | |
10000 fillWater() generates a list of wet lines for a given profile and a | |
10001 given water level. | |
10002 | |
10003 2011-07-08 Ingo Weinzierl <ingo@intevation.de> | |
10004 | |
10005 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
10006 Outputs created while generating the DESCRIBE document will now have the | |
10007 'type' member set. | |
10008 | |
10009 * src/main/java/de/intevation/flys/collections/OutputParser.java: Read the | |
10010 'type' member from DESCRIBE document. | |
10011 | |
10012 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10013 | |
10014 * doc/conf/artifacts/winfo.xml: Removed a typo. | |
10015 | |
10016 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10017 | |
10018 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
10019 DataFacet are now able to store the ID of the state which has created | |
10020 this Facet. | |
10021 | |
10022 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10023 Initialize DataFacets with the ID of this state. This is necessary to | |
10024 renew the waterlevel data if it is no longer existing in the cache. | |
10025 | |
10026 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
10027 | |
10028 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: A | |
10029 report facet can now store the state's id and the artifact's hash value | |
10030 when it has been created. | |
10031 | |
10032 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10033 Initialize the ReportFacet and WaterlevelFacet with state id and hash | |
10034 information. This has been necessary to retrieve reports and waterlevels | |
10035 in states after this one - in states that we need to enter for floodmap | |
10036 parameterization. | |
10037 | |
10038 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
10039 | |
10040 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
10041 Changed the desired UI provider. | |
10042 | |
10043 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
10044 | |
10045 * doc/conf/artifacts/winfo.xml: Added the option to continue the | |
10046 waterlevel parameterization with the intent to create flood maps. | |
10047 | |
10048 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10049 This state is no longer a final state. The user has the option to | |
10050 continue with the parameterization for flood maps based on the current | |
10051 waterlevel. Therefore, this states desires the "continue" UI provider. | |
10052 Clients should recognice this to just step to the next state or display | |
10053 a button that lets the user step to the next state manually. | |
10054 | |
10055 * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
10056 src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
10057 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
10058 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
10059 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
10060 src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
10061 New. These states are used to parameterize a further calculation type: | |
10062 flood map. | |
10063 | |
10064 * src/main/resources/messages.properties, | |
10065 src/main/resources/messages_de_DE.properties, | |
10066 src/main/resources/messages_en.properties, | |
10067 src/main/resources/messages_de.properties: Required strings for the | |
10068 flood maps states. | |
10069 | |
10070 2011-07-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10071 | |
10072 Fix(?) for flys/issue114 | |
10073 | |
10074 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10075 Make guessing a bit more robust. | |
10076 | |
10077 2011-07-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10078 | |
10079 Added the math needed to calculate "W-Differenzen" in "Laengsschnitten". | |
10080 Needs testing! | |
10081 | |
10082 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
10083 Made it an interface to be usable in more than one inheritance chain. | |
10084 | |
10085 * src/main/java/de/intevation/flys/artifacts/model/NamedObjectImpl.java: | |
10086 Implements the NamedObject interface and is the new base class of | |
10087 WQ and WKmsImpl. | |
10088 | |
10089 * src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
10090 New. Interface to associate kms with ws. | |
10091 | |
10092 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
10093 Changed the base class to NamedObjectImpl. Renamed getKms(int) | |
10094 to getKm(int) to make clear it return a single scalar value | |
10095 and fullfil the WKms interface. | |
10096 | |
10097 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
10098 New. Implements the WKms interface. Intended to be a lightweight | |
10099 datastore for "zusaetzliche Laengsschnitte" and as results | |
10100 of the WKmsOperations. | |
10101 | |
10102 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10103 Changed base class to NamedObjectImpl. | |
10104 | |
10105 * src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java: | |
10106 New. Operations on WKms data. | |
10107 Currently only the SUBTRACTION operation is implemented. This | |
10108 one is needed to calculate the "W-Differenzen". The operation | |
10109 is insensitive about the km directions of the datasets. Missing | |
10110 values are interpolated linear. | |
10111 | |
10112 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10113 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10114 Adjusted to satisfy the signature change of WQKMs. | |
10115 | |
10116 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10117 | |
10118 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: New. This | |
10119 XYSeries stores the style information that should be used to render this | |
10120 series. These information are stored as raw XML documents. A public | |
10121 method can be used to apply those style information to a | |
10122 XYLineAndShapeRenderer. | |
10123 | |
10124 Note: The only two attributes currently supported by StyledXYSeries | |
10125 items are "linesize" and "linecolor". | |
10126 | |
10127 * doc/conf/themes.xml: Added some more basic themes for the four | |
10128 calculation methods. | |
10129 | |
10130 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: This | |
10131 generator now tries to apply themes for all series contained in the | |
10132 chart. If a series is no instance of StyledXYSeries, the default | |
10133 renderer is used. | |
10134 | |
10135 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10136 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
10137 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10138 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
10139 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10140 Removed the code that had been introduced to adapt renderers statically. | |
10141 Now, each of these concrete ChartGenerators instantiates StyledXYSeries | |
10142 items to put the curves into the chart. Those items contain style | |
10143 information now! | |
10144 | |
10145 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10146 | |
10147 flys/issue135 (Diagramm: Trotz abgeschalteter Themen bleiben Beschriftungen bestehen) | |
10148 | |
10149 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The way | |
10150 to store datasets has changed. Until this revision, the concrete | |
10151 generators managed their own datasets. E.g. the | |
10152 DischargeLongitudinalSectionGenerator had three datasets: w, q and | |
10153 corrected w. Now, there are just two datasets, managed by this base | |
10154 generator - one dataset for the first Y axis and one dataset for the | |
10155 second Y axis. This makes it easier to remove axes, that have no data to | |
10156 be displayed. All concrete chart generators have to add their XYSeries | |
10157 using two methods: addFirstAxisSeries() and addSecondAxisSeries(). | |
10158 | |
10159 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10160 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
10161 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10162 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
10163 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10164 Those concrete chart generators no longer manage datasets themself but | |
10165 they use the two methods described above, to plot the data to the first | |
10166 or second Y axis. | |
10167 | |
10168 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
10169 | |
10170 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
10171 Added the option to use a filter to reduce the number of items returned | |
10172 by this service. | |
10173 | |
10174 2011-06-30 Ingo Weinzierl <ingo@intevation.de> | |
10175 | |
10176 flys/issue159 (WINFO: Radiobutton - Ortsauswahl bei "W für ungleichwertigen Abflusslängsschnitt" entfernen) | |
10177 | |
10178 * doc/conf/artifacts/winfo.xml: Changed the kilometer range input for | |
10179 calculation 4. This calculation type requires a kilometer range. So, | |
10180 after choosing the calculation 4, the transition model leads to a state | |
10181 that just allows the input of a kilometer range with no option to | |
10182 enter locations. | |
10183 | |
10184 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
10185 New. A base state for the kilometer selection for calculations. The | |
10186 target of this state is to provide facets for the duration curves. | |
10187 | |
10188 * src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java: | |
10189 New. This state is used to enter a kilometer range. The difference to | |
10190 the LocationDistanceSelect state is, that there is no option to enter | |
10191 locations. | |
10192 | |
10193 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
10194 Improved this state to be the base state for calculation ranges. | |
10195 | |
10196 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java | |
10197 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java | |
10198 | |
10199 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
10200 state no longer inherits from RangeState which now is used as base | |
10201 state for kilometer ranges. | |
10202 | |
10203 * src/main/resources/messages.properties, | |
10204 src/main/resources/messages_de_DE.properties, | |
10205 src/main/resources/messages_en.properties, | |
10206 src/main/resources/messages_de.properties: Added new i18n strings for | |
10207 the DistanceSelect state. | |
10208 | |
10209 2011-06-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10210 | |
10211 * pom.xml: Downgraded Trove to 1.1-beta-5, because the new | |
10212 later ones are removed from the maven repos. | |
10213 | |
10214 The functionality we need is in 1.1 so this downgrade should | |
10215 cause no problems. | |
10216 | |
10217 Would be nice if we would support the maintainers of trove to | |
10218 bring there new versions back into the main maven repos. | |
10219 | |
10220 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
10221 | |
10222 * pom.xml: Repaired the JBoss repository which place has changed. | |
10223 | |
10224 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
10225 | |
10226 Tagged RELEASE 2.4 | |
10227 | |
10228 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
10229 | |
10230 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
10231 src/main/java/de/intevation/flys/exports/WstWriter.java: | |
10232 Append the corrected W column (if existing) to the WST export. | |
10233 | |
10234 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10235 | |
10236 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10237 Guessing increaing w is not based on direct neighbors any more. | |
10238 The second to be compared with is choosen by random of | |
10239 the values before the first one. This makes the guessing | |
10240 more robust against 'plateaus' of equal w values. | |
10241 | |
10242 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10243 | |
10244 * src/main/java/de/intevation/flys/exports/ATWriter.java: Array | |
10245 for constructing the spline was too large leading to non-increasing | |
10246 values. | |
10247 | |
10248 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10249 | |
10250 Fix for flys/issue150 | |
10251 | |
10252 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10253 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10254 Invert the x axis if its guessed that water is increasing. | |
10255 | |
10256 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10257 | |
10258 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(guessWaterIncreasing): | |
10259 Added a method to guess based on a given factor of the size (default 0.05) | |
10260 if the water levels are increasing. Needed to determine in which direction | |
10261 the water level curve should be orientated. Based on random to avoid | |
10262 running over large dataset each time a diagram is generated. | |
10263 | |
10264 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
10265 | |
10266 flys/issue177 (WINFO: Abflusskurven am Pegel verursachen ein Hängen des Servers) | |
10267 | |
10268 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10269 Commented out code to generate time ranges for series names. There | |
10270 seems to be a problem while loading the discharge tables of a gauge or | |
10271 while determining the start and/or end time of such discharge tables. | |
10272 | |
10273 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10274 | |
10275 * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. | |
10276 | |
10277 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10278 | |
10279 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10280 Removed dead code. | |
10281 | |
10282 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10283 | |
10284 Fix for flys/issue173 | |
10285 | |
10286 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10287 Fixed the way the gauge was found for a given interval. | |
10288 The old way does not work because it was just tested if | |
10289 the station point was inside the segments which is not | |
10290 necessarily true. The obvious solution to simply check | |
10291 the overlapping intervals does not work either because | |
10292 the gauge ranges touch each other and so more than | |
10293 one gauge are returned in these cases. The River.maxOverlap() | |
10294 is now used to find the gauge with the max overlapping | |
10295 range. | |
10296 | |
10297 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10298 | |
10299 Fix for flys/issue147 | |
10300 | |
10301 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
10302 Removed the 'kmUp' flag. It was an left over from former | |
10303 WSP calculations (w/o ref km) leading to wrong results now. | |
10304 | |
10305 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10306 Don't pass the kmUp flag to the calculation. | |
10307 | |
10308 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10309 Added debug output to see the value of 'wq_free'. | |
10310 | |
10311 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10312 | |
10313 Fix for flys/issue86 | |
10314 | |
10315 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10316 The reference gauge for calculations "am Pegel" was determined | |
10317 wrong. | |
10318 | |
10319 2011-06-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10320 | |
10321 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
10322 Conversion w->q was broken. This should fix a number of issues | |
10323 around "W am Pegel" calculations. | |
10324 | |
10325 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10326 Issue an error report if a w->q conversion fails. | |
10327 | |
10328 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10329 The gauge to convert w->q with its discharge table was determined wrong. | |
10330 | |
10331 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
10332 | |
10333 flys/issue174 (Diagramm: Q-Linie wird bei initialem Laden des Diagramms | |
10334 anders dargestellt als bei Ansicht auf gesamten Wertebereich) | |
10335 | |
10336 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10337 The chart will now have upper margins again. | |
10338 | |
10339 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
10340 | |
10341 flys/issue172 (Diagramm: Ursprung der Diagramme bei Dauerzahlen) | |
10342 | |
10343 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
10344 Charts of this type will have the lower X value set to "0". | |
10345 | |
10346 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10347 | |
10348 * src/main/java/de/intevation/flys/exports/ATWriter.java: | |
10349 Results are now in cm. Made it more robust against corner cases. | |
10350 | |
10351 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10352 Removed superfluous import. | |
10353 | |
10354 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10355 | |
10356 * doc/conf/artifacts/winfo.xml, doc/conf/conf.xml: | |
10357 Added facet config for AT exports. | |
10358 | |
10359 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
10360 Added 'at' facet type. | |
10361 | |
10362 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
10363 Generate AT facets. | |
10364 | |
10365 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10366 | |
10367 * src/main/java/de/intevation/flys/exports/ATExporter.java: New. | |
10368 Exporter for AT facets. Needs testing. | |
10369 | |
10370 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10371 | |
10372 * src/main/java/de/intevation/flys/exports/ATWriter.java: New. | |
10373 Writer for AT files. New code because our data model differs | |
10374 from Desktop-FLYS. Needs testing. | |
10375 | |
10376 2011-06-23 Ingo Weinzierl <ingo@intevation.de> | |
10377 | |
10378 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
10379 | |
10380 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10381 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10382 Moved the method that adjusts the X-axis to include the "0" value from | |
10383 ComputedDischargeCurveGenerator to DischargeCurveGenerator. Now, both | |
10384 charts will include the "0" on the X-axis. | |
10385 | |
10386 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10387 | |
10388 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
10389 Based on WQ now to make it exportable as AT. | |
10390 | |
10391 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10392 | |
10393 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
10394 New. Base class for WQKms. | |
10395 | |
10396 TODO 1: make it a base class for WQDay, too, | |
10397 TODO 2: Generate instances of WQ instead of WQKms in "Abflusskurven" | |
10398 calculations. This will save memory. | |
10399 | |
10400 AT exporter will get instances of this class as data model | |
10401 | |
10402 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
10403 Add default constructor to ease inheritance. | |
10404 | |
10405 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
10406 Based on WQ now. Removed code allready defined in base class. | |
10407 | |
10408 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10409 | |
10410 * doc/conf/artifacts/winfo.xml: Add TODOs for error reports | |
10411 of "Abflusskurven am Pegel". Maybe we don't need them? | |
10412 | |
10413 * doc/conf/conf.xml: Configure report for each calculated output type. | |
10414 | |
10415 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
10416 | |
10417 flys/issue164 (Berechnung 4: Umgekehrtes Berechnungsintervall führt zur) | |
10418 | |
10419 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
10420 Create the items with range information for W and Q which allows the | |
10421 client to validate the user inserted values. | |
10422 | |
10423 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10424 | |
10425 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10426 Arguments in filling datastructure were flip. Now | |
10427 the "Abflusskurve am Pegel" looks correct again. | |
10428 | |
10429 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10430 Removed superfluous imports. | |
10431 | |
10432 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10433 | |
10434 Improved situtation on rendering "Abflusskurve am Pegel". Not | |
10435 fully working, yet. | |
10436 | |
10437 * doc/conf/artifacts/winfo.xml: Generate facets for the location path, too. | |
10438 | |
10439 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Misspelled | |
10440 the facet which prevented the facets from being to the outputs. | |
10441 | |
10442 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
10443 Extended to store the hash and the state id of the producing artifact/state | |
10444 else it results in NPEs because the data is calculated on later (wrong) states. | |
10445 | |
10446 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
10447 Store the state id and the hash in the facet, too. | |
10448 | |
10449 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Add two | |
10450 method to do calculations for a state the artifact is currently not in | |
10451 and fetching the current state id. | |
10452 | |
10453 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10454 | |
10455 * doc/conf/artifacts/winfo.xml: Generate facets for "Abflusskurven am Pegel" | |
10456 Not working by now. :-/ | |
10457 | |
10458 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New facet type | |
10459 for "Abflusskurven am Pegel" | |
10460 | |
10461 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Do calculation | |
10462 in the artifact not in the output generator. | |
10463 | |
10464 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
10465 Generate the new facets. | |
10466 | |
10467 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
10468 Fetch data from facet. | |
10469 | |
10470 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
10471 | |
10472 flys/issue161 (Diagramm: Q-Achse in W-Längsschnitten immer bei Q=0) | |
10473 | |
10474 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10475 The Q axis (which is the second y axis) initially contains the 0 value. | |
10476 After a zoom action has taken place, this behaviour is no longer | |
10477 supported. | |
10478 | |
10479 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10480 | |
10481 Draw correction curve again. | |
10482 | |
10483 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
10484 Use correction curve to map plot to axes. Not doing so prevented | |
10485 the correction curve from being drawn! | |
10486 Smaller code cleanups and simplifications. | |
10487 | |
10488 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
10489 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
10490 Added methods to directly access the components w, q and c | |
10491 at a given index. | |
10492 | |
10493 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
10494 Attribute access via DOM instead of XPath. | |
10495 | |
10496 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10497 Code simplification. | |
10498 | |
10499 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10500 | |
10501 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
10502 | |
10503 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Splitted | |
10504 up zooming for x and y axes to be able to override specific axis | |
10505 zoom behaviour. | |
10506 | |
10507 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
10508 The lower bound of the x axis (which is the Q axis in such chart) is | |
10509 always 0. | |
10510 | |
10511 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10512 | |
10513 flys/issue90 (Diagramm: Trennung derDiagrammfläche und Achsenaufheben) | |
10514 | |
10515 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
10516 Added a margin between chart data and chart axes. | |
10517 | |
10518 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10519 | |
10520 Fix for flys/issue158 | |
10521 | |
10522 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
10523 Checks for right class now. | |
10524 | |
10525 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10526 | |
10527 Fix for flys/issue154 | |
10528 | |
10529 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
10530 Checks for right class now. | |
10531 | |
10532 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10533 | |
10534 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10535 Only generate 'outs' if they have facets. | |
10536 | |
10537 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
10538 'boolean ? true : false' <=> 'boolean' | |
10539 | |
10540 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
10541 | |
10542 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
10543 Added the time-to-live to the DESCRIBE document. | |
10544 | |
10545 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10546 | |
10547 * doc/conf/artifacts/winfo.xml: Configured states to generate report facets. | |
10548 | |
10549 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10550 | |
10551 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
10552 Return the report. | |
10553 | |
10554 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10555 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10556 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10557 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
10558 Generate report facets if there are problems with the calculations. | |
10559 TODO: Adjust winfo.xml to configure the facets. | |
10560 | |
10561 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10562 | |
10563 * src/main/java/de/intevation/flys/exports/ReportGenerator.java: | |
10564 New. Generator for calculation reports. | |
10565 | |
10566 * doc/conf/conf.xml: Added ReportGenerator. | |
10567 | |
10568 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
10569 Added type 'report'. | |
10570 | |
10571 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
10572 Specialized facet for serving reports. TODO: Added them to the | |
10573 calculation states. | |
10574 | |
10575 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
10576 Looped through CallMeta for i18n purposes. TODO: do i18n | |
10577 | |
10578 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10579 Removed superfluous import. | |
10580 | |
10581 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
10582 Added some override annotations. | |
10583 | |
10584 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10585 | |
10586 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java: | |
10587 New. Used to transport the data and the error report. | |
10588 | |
10589 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
10590 src/main/java/de/intevation/flys/artifacts/model/Calculation1.java, | |
10591 src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, | |
10592 src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, | |
10593 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java, | |
10594 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
10595 src/main/java/de/intevation/flys/artifacts/model/Calculation.java, | |
10596 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
10597 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10598 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10599 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10600 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
10601 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
10602 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
10603 Use the CalculationResult now. | |
10604 | |
10605 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10606 | |
10607 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
10608 Allow an explicit reference km to enable calculation "am Pegel". | |
10609 | |
10610 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10611 If a calculation "am Pegel" is done, take start km of the | |
10612 calculation range and find the gauge in which range it is located. | |
10613 Take the station of the gauge as the reference km. If no gauge | |
10614 is found the calcualtion falls back to calculation "auf freier Strecke". | |
10615 | |
10616 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10617 Replaced another inefficient attribute extraction via XPath | |
10618 with direct DOM access. | |
10619 | |
10620 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10621 | |
10622 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
10623 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
10624 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
10625 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10626 Removed dead code. | |
10627 | |
10628 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10629 | |
10630 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java | |
10631 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
10632 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
10633 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10634 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
10635 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10636 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10637 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
10638 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10639 Only generate facets when needed. | |
10640 | |
10641 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
10642 Removed more XPath for simply accessing attributes of an element. | |
10643 | |
10644 * doc/conf/cache.xml: 200 elements in memory for "computed.values" are enough, | |
10645 LRU as eviction strategy is sufficent. | |
10646 | |
10647 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
10648 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Use | |
10649 more 'standard' Java naming conventions. | |
10650 | |
10651 2011-06-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10652 | |
10653 Merged in the facet-slt branch to bring in the 'facet' feature. | |
10654 | |
10655 * doc/conf/artifacts/winfo.xml: Fixed some facets. | |
10656 | |
10657 * doc/conf/cache.xml: Added a "computed.values" cache to store the | |
10658 results of the WINFO calculations. | |
10659 | |
10660 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
10661 Add support for index per facet to make them unique and identifiable. | |
10662 | |
10663 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
10664 New. Inteface to be used to access the facet names of the configuration. | |
10665 | |
10666 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: New. | |
10667 A facet to be used to have raw access to the computed data of an artifact. | |
10668 Useful to export things like CSV and WST. | |
10669 | |
10670 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: New. | |
10671 Specialized facet to access the water level data stored in WQKms arrays. | |
10672 | |
10673 * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: New. | |
10674 Specialized facet to access the duration data stored in WQDay data structures. | |
10675 | |
10676 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Facets are | |
10677 now generated dynamically from the current available ones stored with | |
10678 the artifact. | |
10679 | |
10680 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Added | |
10681 methods computeAdvance() and computeFeed() called if artifact is fed or | |
10682 adance. This overwritten in subclasses to do the state depending calculations. | |
10683 | |
10684 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10685 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
10686 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10687 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10688 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: These | |
10689 states overwrites the computeAdvance() and computeFeed() methods to do | |
10690 the corresponding WINFO calculations. | |
10691 | |
10692 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Calls | |
10693 computeAdvance() and computeFeed() if artifact is fed or advanced. Centralized | |
10694 the caching mechanism. | |
10695 | |
10696 * src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
10697 src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
10698 src/main/java/de/intevation/flys/collections/OutputParser.java, | |
10699 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
10700 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
10701 Adjusted the code to cope with the indices of the facets. Used | |
10702 DOM to access the attributes instead of XPath. Removed smaller bugs | |
10703 concerning position generation. | |
10704 | |
10705 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
10706 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
10707 src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
10708 Forwarded facet references. | |
10709 | |
10710 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
10711 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
10712 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
10713 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
10714 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
10715 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10716 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10717 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
10718 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
10719 Uses facets to fetch data and generate output now. | |
10720 | |
10721 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
10722 | |
10723 * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that | |
10724 determines the mode of calculation 1. If it is "false" (default), | |
10725 the calculation should be bound to a gauge. | |
10726 | |
10727 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
10728 method to retrieve the information about the "wq_free" parameter. | |
10729 | |
10730 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
10731 | |
10732 * doc/conf/artifacts/winfo.xml: Added a facet for corrected W in | |
10733 computation 4. | |
10734 | |
10735 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10736 | |
10737 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
10738 Got rid of namespace in result document. | |
10739 | |
10740 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
10741 | |
10742 flys/issue77 (Diagramm: Beschriftung der Kurven bei Dauerlinien) | |
10743 | |
10744 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
10745 Give the curves in the chart names. | |
10746 | |
10747 * src/main/resources/messages.properties, | |
10748 src/main/resources/messages_de_DE.properties, | |
10749 src/main/resources/messages_en.properties, | |
10750 src/main/resources/messages_de.properties: Added titles for duration | |
10751 chart curves. | |
10752 | |
10753 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10754 | |
10755 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
10756 Write top 'Oberkante' and bottom 'Unterkante' to out going XML | |
10757 if they exist. | |
10758 | |
10759 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
10760 | |
10761 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
10762 Write the min/max W/Q ranges as art:range elements into the DESCRIBE. | |
10763 | |
10764 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
10765 | |
10766 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
10767 This state that is used to retrieve locations will now write the | |
10768 kilometer range of the selected river into the DESCRIBE document. | |
10769 | |
10770 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10771 | |
10772 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
10773 New. Factored out version of "Wasserspiegellage" calculation. | |
10774 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
10775 | |
10776 Removed some dead code. | |
10777 | |
10778 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
10779 Added Override annotation and used quick access method. | |
10780 | |
10781 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
10782 Looped through error reporting use by interpolate. | |
10783 | |
10784 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10785 Used factored out version of calculation 1. Removed dead code. | |
10786 | |
10787 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10788 | |
10789 * src/main/java/de/intevation/flys/artifacts/model/Calculation2.java: | |
10790 New. Factored out version of "Abflusskurve". | |
10791 | |
10792 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
10793 Loop errors through w/q at km interpolation. | |
10794 | |
10795 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10796 Use factored out version of calculation 2. | |
10797 | |
10798 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10799 | |
10800 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
10801 New. Factored out version of "Dauerzahlen". | |
10802 | |
10803 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
10804 Loop errors through for q->w interpolations. | |
10805 | |
10806 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
10807 Added constructor to directly create with calculated results. | |
10808 | |
10809 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
10810 Added method to return the number of problems. | |
10811 | |
10812 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10813 Use factored out version of calculation 3. | |
10814 | |
10815 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10816 | |
10817 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
10818 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java, | |
10819 src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
10820 Added methods to remove NaN values. | |
10821 | |
10822 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10823 | |
10824 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
10825 New. Base class for calculations. Used to collect problems occuring | |
10826 during calculation. | |
10827 | |
10828 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10829 Extends Calculation now. Looped through the problem reports to | |
10830 base class. | |
10831 | |
10832 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
10833 Looped through the problem reports. | |
10834 | |
10835 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
10836 | |
10837 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
10838 Append the min/max range and a transformation matrix for each axis. | |
10839 | |
10840 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
10841 Instantiate the InfoGeneratorHelper with a XYChartGenerator instance. | |
10842 | |
10843 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
10844 Changed the zoom operation. The zoom values defined in the chart request | |
10845 document are no longer absolute values for a specific axis. Those values | |
10846 represent percental values for the start and end point of x and y axes. | |
10847 E.g. a chart has three axes with the following ranges: | |
10848 - x axis : 0 - 10 | |
10849 - y axis 1: 20 - 40 | |
10850 - y axis 2: 40 - 90 | |
10851 - zoom values for x: 0.1 - 0.9 (10% - 90%) | |
10852 - zoom values for y: 0.2 - 0.8 (20% - 80%) | |
10853 The produced chart will have the following ranges: | |
10854 - x axis : 1 - 9 | |
10855 - y axis 1: 24 - 36 | |
10856 y axis 2: 50 - 80 | |
10857 | |
10858 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
10859 | |
10860 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
10861 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
10862 Map datasets to axes correctly. | |
10863 | |
10864 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10865 | |
10866 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10867 Determine the gauges by their station positions. This hopfully | |
10868 fixes the problem with wrong assigned gauges and invalid segments. | |
10869 | |
10870 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10871 | |
10872 * src/main/java/de/intevation/flys/artifacts/model/Segment.java, | |
10873 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10874 Added more debug output. | |
10875 | |
10876 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
10877 | |
10878 flys/issue103 PART 1 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz) | |
10879 | |
10880 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
10881 Selected values are formatted with the current locale. The static part | |
10882 of the DESCRIBE document will now contain i18n formatted numbers. | |
10883 | |
10884 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
10885 | |
10886 flys/issue93 (WINFO: Benennung der Berechnungsart korrigieren) | |
10887 | |
10888 * src/main/resources/messages_de_DE.properties, | |
10889 src/main/resources/messages_de.properties: Changed the name of | |
10890 calculation 4. | |
10891 | |
10892 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
10893 | |
10894 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
10895 Made the range determination more robust against NaN values. | |
10896 | |
10897 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
10898 | |
10899 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
10900 The second y axis is set to position "1". It was set to "2" before, but | |
10901 in that case, there was no position "1". | |
10902 | |
10903 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10904 | |
10905 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
10906 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
10907 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
10908 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
10909 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
10910 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
10911 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
10912 s@m³/s@m\\u00b3/s@ | |
10913 | |
10914 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10915 | |
10916 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
10917 Only generate an axis element if a axis really exists. | |
10918 | |
10919 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10920 | |
10921 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
10922 Simpified array swapping. | |
10923 | |
10924 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10925 | |
10926 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
10927 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10928 Use java.util.List instead of java.util.Vector | |
10929 | |
10930 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10931 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10932 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10933 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10934 Removed superfluous imports. | |
10935 | |
10936 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10937 | |
10938 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
10939 createItem() is not abstract any longer to avoid code repetitionin sub classes. | |
10940 | |
10941 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
10942 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
10943 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
10944 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
10945 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
10946 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
10947 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
10948 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
10949 Removed duplicated code, inserted default constructors and Override annotations. | |
10950 | |
10951 2011-06-07 Ingo Weinzierl <ingo@intevation.de> | |
10952 | |
10953 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
10954 Append axes range information to the info document. | |
10955 | |
10956 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10957 | |
10958 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
10959 If feed() fails do not store invalid values in database. | |
10960 | |
10961 2011-06-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10962 | |
10963 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
10964 Removed asymmetrical "- 1" from width calculation. | |
10965 | |
10966 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10967 | |
10968 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10969 Fixed problem when more than one value per segment are given. | |
10970 | |
10971 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
10972 | |
10973 Refactored version of "Berechnung 4" | |
10974 | |
10975 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
10976 Added instance fields for a reference point (= location of gauge) | |
10977 and backup of values (needed for naming). | |
10978 | |
10979 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
10980 Added a constructor to be created from a WQKms. This is helpful | |
10981 if a WQKms is replaced by a back jump correction. | |
10982 | |
10983 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
10984 New. Outfactored version of "W bei ungleichmaessigen Abflusslaengsschnitt". | |
10985 Much cleaner now and it should have a better handling of the corner | |
10986 cases. | |
10987 | |
10988 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
10989 Removed the linear interpolation stuff. It is now in Linear. Removed | |
10990 the LinearRemap interpolation method because it is not needed any | |
10991 longer. Added a method to interpolate a given km with a given | |
10992 function. | |
10993 | |
10994 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
10995 Removed the old calc 4 and used the new one. | |
10996 | |
10997 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
10998 Deleted. Not needed any longer. | |
10999 | |
11000 * src/main/java/de/intevation/flys/artifacts/math/Function.java: | |
11001 New. Interface for a uni-variate real function. | |
11002 | |
11003 * src/main/java/de/intevation/flys/artifacts/math/Identity.java: | |
11004 New. Implements Function with f(x) = x | |
11005 | |
11006 * src/main/java/de/intevation/flys/artifacts/math/Linear.java: | |
11007 New. Implements Function with f(x) = m*x + b | |
11008 | |
11009 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11010 Factored some stuff out to DoubleUtil. Removed some dead code. | |
11011 Does some rounding correct. | |
11012 | |
11013 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: New. | |
11014 Centralized utils surrounding common double operations. | |
11015 | |
11016 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
11017 Removed superfluous imports. | |
11018 | |
11019 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11020 | |
11021 flys/issue90(Diagramm: Trennung der Diagrammfläche und Achsen aufheben) | |
11022 | |
11023 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
11024 Determine the ranges of x and y axes. If no zoom ranges are given, we | |
11025 will determine the min and max xy values in the dataset manually, | |
11026 because JFreeCharts adds a margin to the left and right of the data | |
11027 area automatically.. | |
11028 | |
11029 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11030 | |
11031 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved | |
11032 the chart creation into an own public method. This lets the | |
11033 ChartInfoGenerator create charts without duplicating code. | |
11034 | |
11035 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
11036 Limited the possible class for generators to XYChartGenerator. This | |
11037 enables the ChartInfoGenerator class to do the whole chart creation | |
11038 stuff itself without outsourcing the code to concrete subclasses. | |
11039 | |
11040 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
11041 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
11042 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
11043 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
11044 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
11045 Removed the code to generate charts - this is done in ChartInfoGenerator | |
11046 now. | |
11047 | |
11048 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
11049 | |
11050 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
11051 methods to extract the x and y ranges from request document. | |
11052 | |
11053 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
11054 method that zooms the chart to the specified x and y ranges. | |
11055 | |
11056 2011-06-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11057 | |
11058 * doc/conf/conf.xml: Set collection ttl to 6 hours. | |
11059 | |
11060 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11061 | |
11062 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
11063 New. Parse segments only once. | |
11064 | |
11065 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11066 Expose new parser to artifacts. TODO: Use it. | |
11067 | |
11068 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11069 | |
11070 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11071 Changed interpolation methods to interpolate to an arbitrary position | |
11072 in a given double result array as a preparation for segment independent | |
11073 calculation. | |
11074 | |
11075 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11076 Removed superfluous import. | |
11077 | |
11078 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11079 Fixed cause for crashing: Run back too far in some siutations. | |
11080 | |
11081 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11082 Refactored range code a bit. Needs more work. | |
11083 | |
11084 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
11085 | |
11086 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
11087 Interchange the lower and upper x value of the chart if the x-axis is | |
11088 inverted before the matrix values are computed. Now, the matrix is able | |
11089 to work with charts that have an inverted x-axis. | |
11090 | |
11091 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
11092 | |
11093 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: New. A | |
11094 chart info generator generates a document that contains meta information | |
11095 for a specific chart. Concrete instances of this abstract class need to | |
11096 instantiate concrete ChartGenerators and dispatch nearly all methods of | |
11097 an OutGenerator (init(), doOut(), setMaster()) to this instance. The | |
11098 generate() method is implemented in the ChartInfoGenerator itself. It | |
11099 creates a chart with help of the ChartGenerator instance and builds a | |
11100 document that contains meta information of this chart. | |
11101 | |
11102 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: New. | |
11103 This helper is used to create the chart info document. At the moment, | |
11104 the only information that is included in this document is a | |
11105 transformation matrix to transform image coordinates into chart | |
11106 coordinates. | |
11107 | |
11108 NOTE: The transformation matrix creation needs some work to support | |
11109 charts with inverted X axis. | |
11110 | |
11111 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
11112 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
11113 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
11114 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
11115 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
11116 Concrete instances of ChartInfoGenerator that create the chart info for | |
11117 the currently supported chart types. | |
11118 | |
11119 * doc/conf/conf.xml: Registered new OutGenerators. | |
11120 | |
11121 2011-05-31 Ingo Weinzierl <ingo@intevation.de> | |
11122 | |
11123 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11124 Added support for the 'type' paramter of the collection's out() | |
11125 operation. | |
11126 | |
11127 2011-05-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11128 | |
11129 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
11130 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11131 Use an explicit reference km for interpolation now. | |
11132 | |
11133 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11134 | |
11135 * doc/conf/cache.xml: Introduced cache to store the distance info per river. | |
11136 This boosts performance in following ab setup from 3.61 to 39.91 requests/secs. | |
11137 | |
11138 $ ab -c 20 -n 1000 -p distances.xml http://127.0.0.1:8181/service/distanceinfo | |
11139 | |
11140 $ cat distances.xml | |
11141 <?xml version="1.0" encoding="UTF-8"?> | |
11142 <art:river xmlns:art="http://www.intevation.de/2009/artifacts">Elbe</art:river> | |
11143 | |
11144 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: Added | |
11145 an iterator result to avoid construction expensive interim lists. | |
11146 | |
11147 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: Use | |
11148 the cache if configured. | |
11149 | |
11150 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11151 | |
11152 flys/issue82 | |
11153 | |
11154 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11155 Only successful interpolations are named. | |
11156 | |
11157 2011-05-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11158 | |
11159 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11160 Make it work independent of river flow direction. | |
11161 | |
11162 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11163 Fixed bug in ordering segments | |
11164 | |
11165 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-enabled | |
11166 calculation of the back jump correction. Fixed more flow direction issues. | |
11167 | |
11168 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11169 | |
11170 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11171 Removed call of XMLDebug class which is not in the version control. | |
11172 | |
11173 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11174 | |
11175 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11176 Moved the code part that skips themes right after the part that sets the | |
11177 master artifact for the OutGenerator. We need this master artifact to | |
11178 display empty charts - master artifact is used to create titles and | |
11179 axes. | |
11180 | |
11181 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11182 | |
11183 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11184 Deactivated themes are not put into the chart. | |
11185 | |
11186 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
11187 | |
11188 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
11189 Repaired broken XPath expressions to find the output modes in an | |
11190 attribute document of a collection. | |
11191 | |
11192 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: This | |
11193 writer will now create a document that has a root node art:attribute. | |
11194 Before these changes, the document's root node was art:outputs which is | |
11195 part of the attribute document but not the right root node. | |
11196 | |
11197 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11198 Adapted some XPath expressions and corrected the the process to create | |
11199 attribute documents. | |
11200 | |
11201 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11202 | |
11203 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11204 Made it work independent of from/to order. | |
11205 | |
11206 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11207 Added method to extract the ranges correctly from data. | |
11208 | |
11209 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11210 Use the correct ranges. Comment out backjump detection temporarily. | |
11211 | |
11212 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11213 | |
11214 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11215 Generate fields for w/q input depend on flow direction. | |
11216 | |
11217 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11218 Moved km up question out of loop. | |
11219 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11220 | |
11221 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11222 Take the flow direction into account. | |
11223 | |
11224 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11225 Prevent NPE. | |
11226 | |
11227 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
11228 Allow to be 'from' greater than 'to' in ranges. | |
11229 | |
11230 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Negate | |
11231 step if 'from' is greater than 'to'. | |
11232 | |
11233 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11234 | |
11235 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11236 Round exploded values to a precision of 1e-6. | |
11237 | |
11238 2011-05-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11239 | |
11240 Qs are now stored in ranges for each column. | |
11241 | |
11242 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
11243 Deleted. | |
11244 | |
11245 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11246 Was WstValueTableFactory2. | |
11247 | |
11248 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
11249 node linking bug. Removed dead code. | |
11250 | |
11251 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11252 Q values are now stored in range trees by each column. The qs of the rows | |
11253 are removed and the calculations are adjusted. Removed dead code. | |
11254 | |
11255 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11256 | |
11257 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11258 Moved cache name to WstValueTableCacheKey. Do not cache null references. | |
11259 | |
11260 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
11261 Moved cache name into this class. | |
11262 | |
11263 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11264 Store QRangeTree for each column of value table. TODO: Use them! | |
11265 | |
11266 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
11267 Intended as a replacement for WstValueTableFactory, but is work in progress. | |
11268 | |
11269 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
11270 index errors and added methods to dump as graphviz graph. | |
11271 | |
11272 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11273 | |
11274 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
11275 Improved the validation of WQ values. | |
11276 | |
11277 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Use the | |
11278 correct input data object to determine the selected WQ mode (range or | |
11279 single input). | |
11280 | |
11281 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11282 | |
11283 ISSUE-40 (part I/II) | |
11284 | |
11285 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
11286 Write default values (values already selected by the user before) of the | |
11287 input data items into DESCRIBE. | |
11288 | |
11289 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11290 | |
11291 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11292 Removed needless imports. | |
11293 | |
11294 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11295 | |
11296 ISSUE-85 (part III/III) | |
11297 | |
11298 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11299 Added a static function that returns the kilometer values (double[]) | |
11300 from locations input (whitespace separated double values). | |
11301 | |
11302 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
11303 the getKms() method. It will now return a computed array of kilometers | |
11304 if we had inserted a range, or it will return the inserted kilometers if | |
11305 we had inserted locations. | |
11306 | |
11307 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11308 | |
11309 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11310 Moved cache key to separate class. | |
11311 | |
11312 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
11313 New. The new cache key class. | |
11314 | |
11315 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11316 | |
11317 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
11318 Model to store the q values of a WST column efficiently. First | |
11319 building block not to store the q values directly aside the | |
11320 w values. | |
11321 | |
11322 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
11323 | |
11324 ISSUE-85 (part I/III) | |
11325 | |
11326 * doc/conf/artifacts/winfo.xml: Added two further field 'ld_mode' and | |
11327 'ld_locations' to the range/locations state to track the selected mode | |
11328 and locations. | |
11329 | |
11330 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
11331 Added methods to validate the user inserted locations. | |
11332 | |
11333 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11334 method to determine of a range or locations have been inserted. | |
11335 | |
11336 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
11337 | |
11338 ISSUE-62 (part II/II) | |
11339 | |
11340 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Dump the | |
11341 artifacts state/data in DEBUG mode in describe(). | |
11342 | |
11343 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
11344 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
11345 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
11346 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
11347 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
11348 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
11349 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
11350 States will no longer store data. The only reason for states storing | |
11351 StateData is to know about the necessary data for this state. If a State | |
11352 needs to access the user input for a specific StateData object, it needs | |
11353 to query the FLYSArtifact which stores the data. | |
11354 | |
11355 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
11356 | |
11357 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11358 method to dump the artifacts state(s)/data. | |
11359 | |
11360 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11361 | |
11362 flys/issue84 | |
11363 | |
11364 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
11365 Forget to select wst kind. | |
11366 | |
11367 2011-05-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11368 | |
11369 flys/issue81 | |
11370 | |
11371 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11372 weights for kms were swapped. | |
11373 | |
11374 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
11375 | |
11376 Tagged RELEASE 2.3.1 | |
11377 | |
11378 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
11379 | |
11380 * Changes: Prepared changes for the upcoming release. | |
11381 | |
11382 2011-05-20 Hans Plum <hans@intevation.de> | |
11383 | |
11384 * NEWS: | |
11385 Hint to Release 2.3.1. For further information look into module | |
11386 flys-client/NEWS | |
11387 | |
11388 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11389 | |
11390 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java (getExplodedValues): | |
11391 Increment kms array size by one to take the end of range, too. | |
11392 | |
11393 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11394 | |
11395 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11396 Sort by rows (should not be necessary). | |
11397 | |
11398 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11399 Use unsharp km lookup (epsilon = 0.0001). This fixes the problem | |
11400 that some kms were not found. | |
11401 | |
11402 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11403 | |
11404 flys/issue66 | |
11405 | |
11406 * src/main/resources/messages_en.properties: Fixed broken template. | |
11407 | |
11408 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11409 | |
11410 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11411 Set the name of the computed discharge curve objects. | |
11412 | |
11413 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11414 The curves of this chart will now have names that consist of the word | |
11415 'Discharge Curve', the river name and the kilometer that has been used | |
11416 for the computation. | |
11417 | |
11418 * src/main/resources/messages.properties, | |
11419 src/main/resources/messages_de_DE.properties, | |
11420 src/main/resources/messages_en.properties, | |
11421 src/main/resources/messages_de.properties: Added i18n strings for the | |
11422 computed discharge curves. | |
11423 | |
11424 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11425 | |
11426 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11427 Added convenience method isQ() to determine if we are | |
11428 doing Q calculations. | |
11429 | |
11430 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11431 Reintroduced titles for the "W for unausgeglichene Abfluesse". | |
11432 | |
11433 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
11434 | |
11435 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
11436 The curves will now have names that consist of the gauge name and its | |
11437 valid time range. | |
11438 | |
11439 * src/main/resources/messages.properties, | |
11440 src/main/resources/messages_de_DE.properties, | |
11441 src/main/resources/messages_en.properties, | |
11442 src/main/resources/messages_de.properties: Added i18n strings for the | |
11443 discharge curves. | |
11444 | |
11445 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11446 | |
11447 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11448 Removed dead code. | |
11449 | |
11450 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11451 | |
11452 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11453 Use the correct method to generate kms. | |
11454 | |
11455 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11456 Added some logging to test the map in debug mode. | |
11457 | |
11458 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11459 | |
11460 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
11461 Made getExplodedValues static. | |
11462 | |
11463 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11464 Use new logic to calculate "W für ungleichwertige Abfluesse". | |
11465 Not working, yet. | |
11466 | |
11467 * ChangeLog: Fixed former entry. | |
11468 | |
11469 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11470 | |
11471 * doc/conf/artifacts/winfo.xml: Registered the WST export for discharge | |
11472 longitudinal sections. | |
11473 | |
11474 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Set the | |
11475 names of the discharge longitudinal section computation results. | |
11476 | |
11477 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
11478 The W/Q curves in the chart will now have names. | |
11479 | |
11480 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11481 The WstWriter is filled with column names in an own method. So, we are | |
11482 able to override this process in subclasses. | |
11483 | |
11484 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
11485 Adapted the column names for the WST export. | |
11486 | |
11487 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11488 | |
11489 Work on flys/issue69 | |
11490 | |
11491 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11492 Use new logic to calculate "Wasserstand/Wasserspiegellage". | |
11493 Compared to desktop FLYS are the results are structurally right | |
11494 but a bit off in the positions after the decimal points. | |
11495 Maybe a result of the interpolation? Need to debug this. | |
11496 | |
11497 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11498 | |
11499 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11500 W and Q curves will now have names based on the defined W or Q values | |
11501 for the waterlevel computation. | |
11502 | |
11503 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
11504 | |
11505 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
11506 New. This object is used to give objects a name. | |
11507 | |
11508 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Inherit | |
11509 from NamedObject now. Because we need to display names for those objects | |
11510 in different places. | |
11511 | |
11512 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The WQKms | |
11513 objects returned by a waterlevel computation will now have names. | |
11514 | |
11515 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11516 Insert the column names for the WSTs into the WstWriter. | |
11517 | |
11518 * src/main/java/de/intevation/flys/exports/WstWriter.java: The column | |
11519 names are written into the head of the WSTs now. | |
11520 | |
11521 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11522 | |
11523 * src/main/java/de/intevation/flys/artifacts/model/WstLine.java: New. This | |
11524 class is used to store the W/Q values of a specific kilometer of a WST. | |
11525 | |
11526 * src/main/java/de/intevation/flys/exports/WstWriter.java: New. A writer | |
11527 that creates WSTs. | |
11528 | |
11529 TODO: The header of the WSTs is not finished. The Q descriptions are | |
11530 missing. | |
11531 | |
11532 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
11533 Enabled WST exports. | |
11534 | |
11535 * doc/conf/artifacts/winfo.xml: Registered the WST export for waterlevels. | |
11536 | |
11537 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11538 | |
11539 * src/main/java/de/intevation/flys/utils/Formatter.java: New. This class | |
11540 supports functions to retrieve formatters for specific types of data | |
11541 used in FLYS. | |
11542 | |
11543 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11544 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11545 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
11546 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
11547 Removed the formatter declaration - the whole formatter stuff is done in | |
11548 Formatter now. | |
11549 | |
11550 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11551 | |
11552 ISSUE-72 | |
11553 | |
11554 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
11555 Repaired broken XPath expressions to extract start and end kilometer. | |
11556 | |
11557 2011-05-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11558 | |
11559 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11560 Removed the Hibernate loading stuff. | |
11561 | |
11562 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
11563 New. The Hibernate loading. | |
11564 | |
11565 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
11566 Use the WstValueTableFactory for loading now. | |
11567 | |
11568 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
11569 | |
11570 Tagged RELEASE 0.1 aka Version 2.3.0 | |
11571 | |
11572 2011-05-16 Hans Plum <hans@intevation.de> | |
11573 | |
11574 * NEWS: | |
11575 New. Giving some user specific perspective to new functionality and | |
11576 changes. This file references releases dates only; details can be find | |
11577 in the client module at flys-client. | |
11578 | |
11579 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11580 | |
11581 First step to calculate "W fuer ungleichwertige Abfluesse" correctly. | |
11582 flys/issue55 | |
11583 | |
11584 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
11585 New. Remaps "gleichwertige" Q values to the corresponding | |
11586 "ungleichwertige" Q values depending on km. | |
11587 | |
11588 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11589 Remap the Q values "ungleichwertig" depending on the | |
11590 "gleichwertige" ones. | |
11591 | |
11592 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11593 | |
11594 First step to fix flys/issue69 | |
11595 | |
11596 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11597 New code path to implement the calculation of "Wasserstand/Wasspiegellage" | |
11598 correctly. TODO 1: Use new path in UI. TODO 2: Remove unused old code. | |
11599 | |
11600 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
11601 | |
11602 * Changes: Prepared Changes for the upcoming release 2.3 - see Changes | |
11603 file to get to know about the changes of the version numbers. | |
11604 | |
11605 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
11606 | |
11607 ISSUE-37 | |
11608 | |
11609 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: This | |
11610 state would be happy if there is a UI provider called "river_panel". | |
11611 | |
11612 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
11613 | |
11614 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
11615 methods that return the requested chart size as integer array [width, | |
11616 height]. The requested size is read from the incomding request document. | |
11617 | |
11618 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The size | |
11619 of a chart is no longer static. The requested size is fetched using | |
11620 ChartGenerator.getSize(). | |
11621 | |
11622 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
11623 | |
11624 ISSUE-52 | |
11625 | |
11626 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11627 The X-Axis of such a chart is inverted, if the head of the river is not | |
11628 at kilometer 0. This type of charts always have the head of the river at | |
11629 the left side. | |
11630 | |
11631 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11632 | |
11633 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
11634 Make incoming XML symmetric to DistanceInfoService. | |
11635 | |
11636 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11637 | |
11638 ISSUE-47 | |
11639 | |
11640 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
11641 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
11642 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11643 Adjusted temporarily the color of the W, Q and corrected W curves to | |
11644 distinguish each other. | |
11645 | |
11646 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11647 | |
11648 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
11649 Adjusted the plot of xy charts - the gridlines are displayed now. | |
11650 | |
11651 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11652 | |
11653 ISSUE-53 | |
11654 | |
11655 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
11656 Added a method that returns the preferred locale based on the available | |
11657 locales of the server and the desired locales of the request (CallMeta). | |
11658 | |
11659 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a | |
11660 method that creates a number formatter with minimum and maximum digits. | |
11661 | |
11662 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
11663 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11664 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11665 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
11666 Formatted the number values of the CSV exports. | |
11667 | |
11668 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11669 | |
11670 * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: | |
11671 New. A data structure that enables us to save a data triple: a range | |
11672 that consist of lower and upper double value and a set of values that | |
11673 belong to this range. | |
11674 | |
11675 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11676 Implemented the validation of W/Q values. | |
11677 | |
11678 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11679 | |
11680 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New | |
11681 method to retrieve i18n messages based on keys. | |
11682 | |
11683 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
11684 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
11685 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
11686 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
11687 Added headers for CSV exports. | |
11688 | |
11689 * src/main/resources/messages.properties, | |
11690 src/main/resources/messages_de_DE.properties, | |
11691 src/main/resources/messages_en.properties, | |
11692 src/main/resources/messages_de.properties: Added new i18n strings for | |
11693 CSV headers. | |
11694 | |
11695 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11696 | |
11697 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
11698 Fetches river name from incoming XML document. If no river is given all | |
11699 infos about all rivers are listed. | |
11700 | |
11701 * src/main/resources/metadata/template.xml: Templates honors the 'river' | |
11702 parameter. | |
11703 | |
11704 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
11705 Extended to pass parameters to the templating. Added support for | |
11706 type conversion. | |
11707 | |
11708 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
11709 Take parameters as an initial stack frame. | |
11710 | |
11711 * src/main/java/de/intevation/flys/artifacts/services/meta/TypeConverter.java: | |
11712 New. Converts types off stacked variables. | |
11713 | |
11714 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11715 | |
11716 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
11717 method to add subtitles to charts. The implementation in this class does | |
11718 not add any subtitle. Concrete subclasses may override this method to | |
11719 add some. | |
11720 | |
11721 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
11722 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
11723 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11724 Add subtitles to charts. | |
11725 | |
11726 * src/main/resources/messages.properties, | |
11727 src/main/resources/messages_de_DE.properties, | |
11728 src/main/resources/messages_en.properties, | |
11729 src/main/resources/messages_de.properties: Added i18n templates for | |
11730 compound messages (chart subtitles). | |
11731 | |
11732 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11733 | |
11734 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
11735 Added new methods to retrieve translated compound messages. | |
11736 | |
11737 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11738 | |
11739 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a | |
11740 method to set the master artifact that should be used for some special | |
11741 operations. | |
11742 | |
11743 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
11744 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
11745 Implement the setMasterArtifact() method of the interface. | |
11746 | |
11747 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11748 Call OutGenerator.setMasterArtifact(). | |
11749 | |
11750 NOTE: The determination of the master artifact needs to be implemented! | |
11751 | |
11752 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
11753 | |
11754 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
11755 hard coded dev code that defined a WQ mode. | |
11756 | |
11757 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11758 | |
11759 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
11760 Stripped ugly extra whitespace from output introduced by | |
11761 templating. | |
11762 | |
11763 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11764 | |
11765 * src/main/resources/metadata/template.xml: Added forgotten | |
11766 columns of fixation WSTs. | |
11767 | |
11768 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
11769 | |
11770 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
11771 method to retrieve i18n strings. | |
11772 | |
11773 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
11774 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
11775 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
11776 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11777 Enabled i18n support for chart title and axes labels. | |
11778 | |
11779 * src/main/resources/messages.properties, | |
11780 src/main/resources/messages_de_DE.properties, | |
11781 src/main/resources/messages_en.properties, | |
11782 src/main/resources/messages_de.properties: Added i18n strings for the | |
11783 chart types above. | |
11784 | |
11785 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
11786 | |
11787 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
11788 New. This OutGenerator exports the data of a discharge longitudinal | |
11789 section computation. | |
11790 | |
11791 * doc/conf/conf.xml: Added the DischargeLongitudinalSectionExporter. | |
11792 | |
11793 * doc/conf/artifacts/winfo.xml: Added the exporter with CSV facet to the | |
11794 discharge_longitudinal_section state. | |
11795 | |
11796 2011-05-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11797 | |
11798 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
11799 Added code to make back jump correction work with both | |
11800 potential flow directions. | |
11801 | |
11802 2011-05-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11803 | |
11804 * src/main/resources/metadata/template.xml: | |
11805 Added data cage configuration for 'Längsschnitt'. | |
11806 | |
11807 2011-05-06 Ingo Weinzierl <ingo@intevation.de> | |
11808 | |
11809 * doc/conf/artifacts/winfo.xml: Added the missing Q facet for discharge | |
11810 longitudinal sections. | |
11811 | |
11812 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: New. A | |
11813 derived dataset to store W/Q values with corrected Ws for a kilometer | |
11814 range. | |
11815 | |
11816 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Some new | |
11817 methods and a new constructor to initialize this data object with a | |
11818 predefined set of values. | |
11819 | |
11820 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
11821 methods to retrieve the W/Q values for the 'discharge longitudinal | |
11822 section' computation. | |
11823 | |
11824 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: New | |
11825 methods to retrieve and compute data used for the 'discharge | |
11826 longitudinal section' computation. | |
11827 | |
11828 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
11829 | |
11830 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
11831 Bugfix: just write the ranges of gauges into the DESCRIBE if the | |
11832 'wq_values' data item is required. | |
11833 | |
11834 * src/main/resources/messages.properties, | |
11835 src/main/resources/messages_de_DE.properties, | |
11836 src/main/resources/messages_en.properties, | |
11837 src/main/resources/messages_de.properties: Added i18n messages used in | |
11838 the DESCRIBE of the WQAdapted state. | |
11839 | |
11840 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
11841 | |
11842 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11843 Changed the title of the y-axis (now 'W [NN+m]'). | |
11844 | |
11845 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
11846 | |
11847 * doc/conf/artifacts/winfo.xml: Improved the transition model to reach the | |
11848 output state for creating 'discharge longitudinal section' charts. | |
11849 | |
11850 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
11851 method that returns all gauges of the selected river based on a the | |
11852 given kilometer range. | |
11853 | |
11854 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: New. | |
11855 This state creates a set of elements for the DESCRIBE that consist of a | |
11856 tuple of kilometer values. The number of elements depend on the number | |
11857 of gauges intersected by the given kilometer range. | |
11858 | |
11859 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
11860 New. This state is the output state that is reached after the 'discharge | |
11861 longitudinal section' computation has been chosen. | |
11862 | |
11863 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
11864 | |
11865 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Default | |
11866 step width between two kilometers added - if no step width is given, | |
11867 this default width is used. | |
11868 | |
11869 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
11870 | |
11871 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
11872 Fixed a potential NullPointerException if there is just a single | |
11873 kilometer given to create a longitudinal section. | |
11874 | |
11875 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11876 | |
11877 * pom.xml: Added http://repository.jboss.org/maven2 repo | |
11878 to fix flys/issue30 | |
11879 | |
11880 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
11881 | |
11882 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
11883 To make diagram generation possible ws are now generated from qs | |
11884 because they are many ws having different qs. | |
11885 | |
11886 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
11887 | |
11888 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
11889 Fetch the WQ data from WINFO artifact and write those values into the | |
11890 CSV export. | |
11891 | |
11892 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
11893 | |
11894 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
11895 methods to compute and retrieve the data for discharge curves (computed). | |
11896 | |
11897 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11898 Fetch the computed discharge curve data from WINFOArtifact and add the | |
11899 values into the JFreeChart dataset. | |
11900 | |
11901 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
11902 | |
11903 * doc/conf/artifacts/winfo.xml: Added new transitions and states to enable | |
11904 the WINFO artifact for computing discharge curves. | |
11905 | |
11906 * doc/conf/conf.xml: Added OutGenerators that generate computed discharge | |
11907 curves and exports for its data. | |
11908 | |
11909 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
11910 New. This state is reached if the user chose the computed discharge | |
11911 curve. | |
11912 | |
11913 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
11914 New. This is only a stub implementation at the moment. This | |
11915 OutGenerator should create computed discharge curves later. It extends | |
11916 the DischargeCurveGenerator which should do the same stuff for discharge | |
11917 curves for gauges. | |
11918 | |
11919 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
11920 New. This is only a stub implementation at the moment. This OutGenerator | |
11921 should create the exports of the discharge curve computation. | |
11922 | |
11923 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11924 | |
11925 * doc/conf/artifacts/winfo.xml: Added a new output mode for the duration | |
11926 curve state (CSV export). | |
11927 | |
11928 * doc/conf/conf.xml: Added a new OutGenerator to export duration curve | |
11929 computations. | |
11930 | |
11931 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New. | |
11932 This abstract OutGenerator represents the base class for exporting | |
11933 computed data. Currently, the CSV export is supported. | |
11934 | |
11935 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Moved | |
11936 the most code to export to CSV into the AbstractExporter. | |
11937 | |
11938 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
11939 New. This exporter exports the computed data of a duration computation. | |
11940 | |
11941 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11942 | |
11943 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11944 Modified a wrong debug statement which would confuse the user. | |
11945 | |
11946 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11947 | |
11948 * doc/conf/artifacts/winfo.xml: Added a new output mode for the waterlevel | |
11949 state (CSV export). | |
11950 | |
11951 * doc/conf/conf.xml: Added a new OutGenerator to export waterlevels. | |
11952 | |
11953 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: New. | |
11954 This OutGenerator exports the data of a waterlevel computation. Note: | |
11955 It is necessary to specify the desired facet (e.g. | |
11956 'waterlevel_export.csv'). | |
11957 | |
11958 * pom.xml: Added a dependency to OpenCSV. | |
11959 | |
11960 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11961 | |
11962 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
11963 Introduced an "export" output target. If the target is "export", a | |
11964 facet (read from the incoming xml document) is a necessary parameter | |
11965 that determines which facets are written to the output. | |
11966 | |
11967 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11968 | |
11969 * src/main/resources/messages_en.properties: Bugfix: replaced german | |
11970 string (copy & paste mistake). | |
11971 | |
11972 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11973 | |
11974 * src/main/resources/messages.properties, | |
11975 src/main/resources/messages_de_DE.properties, | |
11976 src/main/resources/messages_en.properties, | |
11977 src/main/resources/messages_de.properties: Added new i18n strings for | |
11978 for the location selection. | |
11979 | |
11980 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
11981 | |
11982 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
11983 New. An OutGenerator for creating duration curves. | |
11984 | |
11985 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: New. A | |
11986 model class to store necessary data for creating W and Q facets of a | |
11987 duration curve. This model stores W, Q and Days. | |
11988 | |
11989 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
11990 Added a function to retrieve tuples of (day, q) based on a given gauge - | |
11991 these tuples are necessary for creating duration curves. | |
11992 | |
11993 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
11994 methods to compute and retrieve the data necessary for creating duration | |
11995 curves. | |
11996 | |
11997 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
11998 Bugfix: improved the access to the location array (avoid | |
11999 NullPointerException). | |
12000 | |
12001 * doc/conf/conf.xml: Registered the new OutGenerator for duration curves. | |
12002 | |
12003 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12004 | |
12005 * contrib/visualize-transitions.xsl: State quoting was done wrong. | |
12006 | |
12007 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12008 | |
12009 * doc/conf/artifacts/winfo.xml: Enhanced the transition model to reach the | |
12010 final state for creating duration curves. | |
12011 | |
12012 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
12013 New. This state should be reached to just insert an array of locations. | |
12014 | |
12015 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: | |
12016 New. This state is reached if the duration curve calculation is | |
12017 selected. | |
12018 | |
12019 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adjusted | |
12020 getDistance() so that it takes care on inserted locations - not just | |
12021 inserted ranges. | |
12022 | |
12023 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12024 | |
12025 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
12026 Flush/persist caches at program exists. | |
12027 | |
12028 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12029 Commented out too eloquent debug output. | |
12030 | |
12031 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12032 | |
12033 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12034 Uses the methods of FLYSArtifact to retrieve the necessary information | |
12035 rivername and selected distance. | |
12036 | |
12037 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12038 | |
12039 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12040 Added interpolateW method to take reference to result ws array | |
12041 as an argument to avoid expensive array allocations in km iterating | |
12042 loops. | |
12043 | |
12044 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
12045 Added a constructor to create backing trove datastructure | |
12046 with the right capacity. | |
12047 | |
12048 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
12049 Move allocation of result ws out of km loop. | |
12050 | |
12051 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12052 | |
12053 * doc/conf/artifacts/winfo.xml: Added two further data items in the WQ | |
12054 selection state. Those items are necessary to store the information | |
12055 about the selected mode (range/single selection) and the values of the | |
12056 single selection. | |
12057 | |
12058 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: If | |
12059 there is no value for a data item, this item is not written into the | |
12060 static DESCRIBE part. | |
12061 | |
12062 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
12063 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
12064 Renamed the method to validate upper and lower values. | |
12065 | |
12066 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
12067 state can now handle values inserted in the single selection. Therefore, | |
12068 new validate methods has been added. | |
12069 | |
12070 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
12071 methods getWs() and getWs() take care on the values inserted in the | |
12072 single insert mode of the client which enables the user to insert single | |
12073 W and Q. | |
12074 | |
12075 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12076 | |
12077 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12078 Repaired getQForW() by calculating indices on right dimension. | |
12079 | |
12080 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12081 | |
12082 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
12083 methods for retrieving selected W values (getWs()). | |
12084 | |
12085 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
12086 method for retrieving waterlevel data takes care on selected Ws, now. | |
12087 The selected Ws are transformed using the DischargeTables.getQForW() | |
12088 into Q values. | |
12089 | |
12090 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12091 | |
12092 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12093 Removed an unused parameter 'result' of getQForW(). | |
12094 | |
12095 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
12096 | |
12097 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Removed | |
12098 the getDataset() method and replaced it with a addDataset() method. | |
12099 On this way, concrete subclasses of this OutGenerator can have multiple | |
12100 datasets (e.g. different datasets for W and Q). This abstract method is | |
12101 called after the chart generation is finished. | |
12102 | |
12103 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12104 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12105 Both classes implement the addDataset() method. The | |
12106 LongitudinalSectionGenerator has already multiple datasets for W and Q. | |
12107 Both are added to the chart - both have an own range axis. | |
12108 | |
12109 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12110 | |
12111 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12112 Use the cache for the wst value table if configured. | |
12113 | |
12114 * doc/conf/cache.xml: Choose a more precise name for the | |
12115 wst value table cache. | |
12116 | |
12117 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12118 | |
12119 * pom.xml: Added dependency to Ehcache. Apache 2.0 license. | |
12120 | |
12121 * doc/conf/conf.xml: Added configuration of ehcache. | |
12122 | |
12123 * doc/conf/cache.xml: New. Cache configurations. | |
12124 | |
12125 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
12126 New. Factory to access caches. | |
12127 | |
12128 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12129 | |
12130 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12131 Forgot to add. | |
12132 | |
12133 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
12134 New. Given a database connection and a XML template it generates | |
12135 an output with meta data about the database. | |
12136 | |
12137 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
12138 New. Holds prepared statements optimized to be run in the stack of | |
12139 contextes. | |
12140 | |
12141 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
12142 New. Model to hold a hierarchical scope of variables. | |
12143 | |
12144 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
12145 New. Stores data set fetched from a sql select to be iterated in | |
12146 a context. | |
12147 | |
12148 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
12149 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12150 Removed superfluous imports. | |
12151 | |
12152 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12153 | |
12154 * doc/conf/conf.xml: Added meta data service. | |
12155 | |
12156 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
12157 Stub for the meta data service. | |
12158 | |
12159 * src/main/resources/metadata/template.xml: Initial template for | |
12160 the meta data service. | |
12161 | |
12162 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12163 | |
12164 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12165 Bugfix: Now, curves for Q values are drawn into a longitudinal section | |
12166 chart as well. Therefore, it was necessary to change the datastructure | |
12167 of the inner class ThemeList that stores all themes included in a chart | |
12168 in an ordered list (stored in a java.util.Vector now). | |
12169 | |
12170 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12171 | |
12172 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: New. An | |
12173 abstract base class for ChartGenerators that create XY charts. | |
12174 | |
12175 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12176 Sourced the generate() method out to the XYChartGenerator. | |
12177 | |
12178 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12179 Implemented the methods to add W and Q facets to the chart. | |
12180 | |
12181 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12182 | |
12183 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Improved | |
12184 the calculation of the step with for ranges. | |
12185 | |
12186 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12187 | |
12188 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Added a | |
12189 method that returns the number of elements stored in the data pool. | |
12190 | |
12191 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12192 | |
12193 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
12194 Added a get() method which takes destination array as an | |
12195 argument. | |
12196 | |
12197 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12198 | |
12199 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Changed the | |
12200 data structure to store w, q and kms values from List<Double> to | |
12201 TDoubleArrayList which stores native double values instead of big | |
12202 Double values. | |
12203 | |
12204 * pom.xml: Added the GNU Trove dependency. | |
12205 | |
12206 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12207 | |
12208 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added the | |
12209 name a the requested facet to doOut(). Concrete generators should just | |
12210 create output for this facet now. | |
12211 | |
12212 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
12213 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
12214 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12215 Adapted the method signature of doOut(). | |
12216 | |
12217 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12218 Adapted the method call of OutGenerator.doOut(). | |
12219 | |
12220 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12221 | |
12222 * doc/conf/themes.xml: Added mappings for the facets | |
12223 longitudinal.section.w and longitudinal.section.q. | |
12224 | |
12225 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12226 | |
12227 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added some | |
12228 methods to retrieve necessary information for computing the data of a | |
12229 waterlevel. | |
12230 | |
12231 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
12232 methods to compute and retrieve the data of a waterlevel computation. | |
12233 | |
12234 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12235 | |
12236 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: New. This | |
12237 model class represents a pool of data triples that consist of W, Q and | |
12238 Kms information. This class might be used to compute data for creating | |
12239 longitudinal section curves (which are based on those W, Q and Kms | |
12240 values). | |
12241 | |
12242 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
12243 | |
12244 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12245 Bugfix: Removed endless loop and a bug while iterating over Hibernate | |
12246 results. | |
12247 | |
12248 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12249 | |
12250 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
12251 New. An OutGenerator that creates longitudinal section curves. | |
12252 | |
12253 NOTE: This is just the stub - the out creation needs to be implemented! | |
12254 | |
12255 * doc/conf/conf.xml: Added the LongitudinalSectionGenerator. | |
12256 | |
12257 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12258 | |
12259 * doc/conf/conf.xml: Bugfix: Added missing <output-generators> section. | |
12260 | |
12261 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12262 | |
12263 * src/main/java/de/intevation/flys/artifacts/WaterlevelState.java: New. | |
12264 This state should be reached if the 'calc.surface.curve' calculation | |
12265 method has been chosen. | |
12266 | |
12267 * doc/conf/artifacts/winfo.xml: Modified a transition and added the | |
12268 WaterlevelState. This state is reached if the 'calc.surface.curve' | |
12269 calculation method has been chosen. It currently has 1 output - a | |
12270 longitudinal section that is not implemented yet! | |
12271 | |
12272 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12273 | |
12274 * src/main/java/de/intevation/flys/artifacts/transitions/ValueCompareTransition.java: | |
12275 New. This transition is valid if the a data object of the current | |
12276 artifact equals/notequals a configured value in the transition model. | |
12277 | |
12278 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12279 | |
12280 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
12281 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Bugfixes: | |
12282 - Adapted the parameters of the isStateReachable() call - added the | |
12283 artifact and the current state. | |
12284 - Append the outputs of a current state if the state is filled with | |
12285 valid data. | |
12286 | |
12287 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12288 | |
12289 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
12290 Added the missing init() method that has been introduced in the | |
12291 interface some commits ealier. | |
12292 | |
12293 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
12294 Call init() after a Transition has been created. | |
12295 | |
12296 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12297 | |
12298 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
12299 Bugfix: Introduced a <art:outputs> node in the attribute document of a | |
12300 Collection that contains further <art:output> nodes - instead of having | |
12301 multiple <art:output> nodes at toplevel of the document. | |
12302 | |
12303 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12304 Adapted the XPath to retrieve the outputs in the attribute document of a | |
12305 Collection. | |
12306 | |
12307 2011-04-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12308 | |
12309 * contrib/visualize-transitions.xsl: Added to create a | |
12310 Graphviz digraph out of the config.xml. Usage: | |
12311 | |
12312 $ xsltproc --stringparam base-dir ../doc/conf/ \ | |
12313 contrib/visualize-transitions.xsl \ | |
12314 doc/conf/conf.xml > transitions.dot | |
12315 | |
12316 $ dot -Tsvg -o transitions.svg transitions.dot | |
12317 | |
12318 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12319 | |
12320 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
12321 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
12322 If no data has been inserted so far, an IllegalArgumentException is | |
12323 thrown. | |
12324 | |
12325 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
12326 | |
12327 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:: | |
12328 A lot of new methods to retrieve the theme of a facet - used while | |
12329 creating the output of a facet/artifact. If a facet has no theme yet, it | |
12330 is initialized. | |
12331 | |
12332 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12333 | |
12334 * src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
12335 src/main/java/de/intevation/flys/collections/OutputParser.java: Removed | |
12336 useless imports. | |
12337 | |
12338 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12339 | |
12340 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: New. An | |
12341 abstract OutGenerator that might be used to create chart output. Some | |
12342 basic things that are equal in all charts should be done here! | |
12343 | |
12344 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12345 This OutGenerator no longer implements the OutGenerator directly, but it | |
12346 extends the ChartGenerator now. | |
12347 | |
12348 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
12349 | |
12350 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12351 Restructured the out() operation of a collection: Now, we collect a list | |
12352 of artifacts/facets and use this for the OutGenerator. Its doOut() | |
12353 method gets the attribute of an artifact - the position and the active | |
12354 state is managed by the Collection itself. | |
12355 | |
12356 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
12357 | |
12358 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: New. | |
12359 a specialized facet that stores information about its position and its | |
12360 state (active/inactive) in an output of a collection. | |
12361 | |
12362 * src/main/java/de/intevation/flys/collections/AttributeParser.java: New. | |
12363 This parser takes the attributes (XML) of a collection and extracts the | |
12364 contained outputs with its facets. The result is a Map<String, Output>. | |
12365 | |
12366 * src/main/java/de/intevation/flys/collections/OutputParser.java: New. | |
12367 This parser is used to query the artifact's DESCRIBE and to extract the | |
12368 supported outputs. The result is a Map<String, Output>. | |
12369 | |
12370 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: New. | |
12371 This writer merges the outputs contained in an attribute of a collection | |
12372 with the outputs of a collection's artifacts. | |
12373 | |
12374 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12375 The attributes of a collection are written into its DESCRIBE document | |
12376 now. The OutputParser and AttributeParser are used to read the supported | |
12377 attributes by the collection and its artifacts - the AttributeWriter is | |
12378 used to merge both attributes and create a final attribute document. | |
12379 | |
12380 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
12381 | |
12382 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java, | |
12383 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
12384 The facet-2-theme mappings are initialized at startup and stored in the | |
12385 FLYSContext. | |
12386 | |
12387 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Added a | |
12388 function that retrieves a theme from FLYSContext based on its name. | |
12389 | |
12390 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12391 | |
12392 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12393 Corrected a silly c&p mistake. | |
12394 | |
12395 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12396 | |
12397 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
12398 | |
12399 Implementation of the "Ruecksprungkorrektur" to be done in | |
12400 "W fuer angepassten Abflusslaengschnitt". | |
12401 | |
12402 All tests show the expected results. In some corner cases the | |
12403 algorithm described in the "Anwenderhandbuch" chapter 3.3.4.3 "Korrektur" | |
12404 has some definition shortcomings: | |
12405 | |
12406 a - What should happend when you cannot find point 2 because | |
12407 you cannot step back one quarter from point 3 because there | |
12408 is no data there any more (river too short in this direction)? | |
12409 The implemented algorithm raises point 3' only to an | |
12410 according factor. E.g. If you can step back the whole quarter | |
12411 distance the elevation is the full quarter. If you can | |
12412 step back only the half of the quarter the elevation is | |
12413 only an eighth. | |
12414 | |
12415 b - If the water heights between point 2 and 3 are constant then | |
12416 the algorithm will produce a spline interpolation that | |
12417 lowers those values. Is this intended? | |
12418 | |
12419 For real data the back jumps are expected to be more in the middle | |
12420 of the distance ranges so the corner cases are maybe not so | |
12421 important. | |
12422 | |
12423 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
12424 Removed superfluous import. | |
12425 | |
12426 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12427 | |
12428 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Removed debug | |
12429 code that has been commited by accident. | |
12430 | |
12431 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12432 | |
12433 * doc/conf/themes.xml: New. A first small theme configuration. | |
12434 | |
12435 * doc/conf/conf.xml: Added a link to the theme configuration. | |
12436 | |
12437 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
12438 Defined a key that is used to store a themes map in the FLYSContext. | |
12439 | |
12440 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
12441 The theme configuration is read at startup and the themes are stores in | |
12442 the FLYSContext. | |
12443 | |
12444 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
12445 | |
12446 * src/main/java/de/intevation/flys/themes/Theme.java, | |
12447 src/main/java/de/intevation/flys/themes/DefaultTheme.java: | |
12448 New. The interface and its default implementation that represents themes | |
12449 used to style charts and maps. | |
12450 | |
12451 * src/main/java/de/intevation/flys/themes/ThemeField.java, | |
12452 src/main/java/de/intevation/flys/themes/DefaultThemeField.java: | |
12453 New. The interface and its default implementation that represents fields | |
12454 in themes. A theme might be "Lines" and one of its field might be | |
12455 "Color" or "Size". | |
12456 | |
12457 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: A factory | |
12458 that creates new themes based on a theme configuration. | |
12459 | |
12460 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12461 | |
12462 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12463 Implementation of "Abflusskurve/Abflusstafel" calculation. | |
12464 | |
12465 Added method interpolateWQ() which takes an km and results in a | |
12466 tuple of two double arrays containing the w/q values interpolated | |
12467 between the surrounding w/q values of the table. | |
12468 w values are interpolated linear, q values with a cubic spline. | |
12469 | |
12470 Drawing w over q gives you the discharge table at the given km. | |
12471 | |
12472 !!! This code needs testing !!! | |
12473 | |
12474 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12475 | |
12476 * pom.xml: Added dependency to Apache Commons Math 2.2 (Apache License 2.0) | |
12477 | |
12478 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12479 | |
12480 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12481 Fix problem when sorting by q (copied w instead of q). | |
12482 | |
12483 2011-04-20 Ingo Weinzierl <ingo@intevation.de> | |
12484 | |
12485 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12486 Fixed broken HQL statement. | |
12487 | |
12488 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12489 | |
12490 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12491 add a method interpolateW() which takes an array of | |
12492 q values and returns an equal sized array of w values. | |
12493 This is essentially the "Wasserstand/Wasserspiegellagen" calculation | |
12494 of desktop FLYS. | |
12495 | |
12496 If you want to do a calculation with given w values you have | |
12497 to convert the w values with DischargeTables.getQForW() first. | |
12498 | |
12499 !!! This code needs heavy testing !!! | |
12500 | |
12501 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12502 | |
12503 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12504 We need a getQForW() method and not getWForQ() because when | |
12505 doing a "Wasserstand/Wasserspiegellagen" calculation with given | |
12506 w values these values need to be translated to q values with | |
12507 the master discharge table. | |
12508 | |
12509 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12510 | |
12511 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12512 Sorting of q values was done wrong. | |
12513 | |
12514 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12515 | |
12516 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
12517 Ordered the list of annotations returned by this factory based on its | |
12518 range. | |
12519 | |
12520 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12521 | |
12522 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
12523 New. This service returns an XML document that includes the main values | |
12524 of a gauge based on a river name, a start and an end point. | |
12525 | |
12526 * doc/conf/conf.xml: Registered the MainValuesService. | |
12527 | |
12528 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
12529 | |
12530 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
12531 A factory that provides methods to return MainValues. | |
12532 | |
12533 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12534 | |
12535 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12536 Added static method getWForQ() to interpolate a w value for | |
12537 a given q value based on a given discharge table. | |
12538 | |
12539 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12540 | |
12541 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12542 Added convenience constructors/methods to ease the access to the master | |
12543 discharge table of a gauge. | |
12544 | |
12545 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12546 | |
12547 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12548 Moved the query complexity into view 'wst_value_table' and | |
12549 used this instead. | |
12550 | |
12551 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12552 | |
12553 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
12554 Fetches w/q value tables from the backend. TODO: Move this | |
12555 to the backend and use a view. | |
12556 | |
12557 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12558 | |
12559 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
12560 the error key that is thrown if no input data was found so that the key | |
12561 is usable for GWT's i18n mechanism. | |
12562 | |
12563 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12564 | |
12565 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
12566 The inserted river is validated now (overrides validate() of | |
12567 DefaultState). | |
12568 | |
12569 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12570 | |
12571 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
12572 The inserted calculation method is validated now (overrides validate() | |
12573 of DefaultState). | |
12574 | |
12575 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12576 | |
12577 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
12578 The input data of feed() are validated using the DefaultStates | |
12579 validate() method. | |
12580 | |
12581 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
12582 New method validate() that needs to be overidden by concrete subclasses. | |
12583 It should return true, if the data of the State is fine, otherwise it | |
12584 should raise an exception. | |
12585 | |
12586 NOTE: The exceptions are not translated in the server but in the client! | |
12587 | |
12588 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: New. | |
12589 This abstract class exists to provide some methods for handling ranges. | |
12590 Currently, there is a method that validates a given range based on | |
12591 min/max values. | |
12592 | |
12593 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
12594 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
12595 Implemented input data validation for ranges. | |
12596 | |
12597 NOTE: The input validation of concrete values has not been implemented | |
12598 yet! | |
12599 | |
12600 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12601 | |
12602 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
12603 Removed debug code that has been commited by accident :-/ | |
12604 | |
12605 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
12606 | |
12607 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
12608 getGauge() method returns the first gauge based on the given start and | |
12609 end point of the river. | |
12610 | |
12611 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
12612 Fixed potential bugs: if no gauge could be determined, the default | |
12613 values for W and Q are the minimum and maximum double values. | |
12614 | |
12615 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
12616 | |
12617 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fills | |
12618 the DESCRIBE with default values for W and Q. | |
12619 | |
12620 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
12621 | |
12622 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
12623 New. Returns Wst object - based on a river. | |
12624 | |
12625 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
12626 | |
12627 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Now | |
12628 provides some methods that return some basic objects inserted while | |
12629 parameterization: River, Gauge and so on. | |
12630 | |
12631 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
12632 | |
12633 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
12634 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
12635 Bugfix: Repaired broken imports of the SessionHolder. | |
12636 | |
12637 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
12638 | |
12639 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
12640 Moved this class to flys-backend. | |
12641 | |
12642 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
12643 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
12644 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
12645 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, | |
12646 src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
12647 Adapted imports of the SessionHolder. | |
12648 | |
12649 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12650 | |
12651 * trunk/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
12652 trunk/src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
12653 Acquire/release sessions in services to avoid db connection leaks. | |
12654 | |
12655 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12656 | |
12657 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
12658 Changed some method signatures - added a reference to the owner | |
12659 Artifact. | |
12660 | |
12661 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
12662 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
12663 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
12664 Modified method signatures based on the changes in DefaultState. | |
12665 | |
12666 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
12667 Added default values to the dynamic part of DESCRIBE. | |
12668 | |
12669 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12670 | |
12671 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
12672 Added a function that returns a River object based on a given river | |
12673 name. | |
12674 | |
12675 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12676 | |
12677 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
12678 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
12679 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
12680 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
12681 Static methods are using the SessionHolder, too. | |
12682 | |
12683 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12684 | |
12685 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
12686 Added the setup() method that has been added to the interface | |
12687 description in the last commits. | |
12688 | |
12689 * doc/conf/conf.xml: Registered the SessionCallContextListener as | |
12690 CallContext.Listener. | |
12691 | |
12692 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12693 | |
12694 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
12695 Bugfix: Call correct method to retrieve an instance of | |
12696 SessionFactoryProvider. | |
12697 | |
12698 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12699 | |
12700 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
12701 New. Contains thread local session holder for hibernate sessions. | |
12702 | |
12703 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
12704 Uses session from SessionHolder. | |
12705 | |
12706 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
12707 Interacts with SessionHolder now. | |
12708 | |
12709 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
12710 Removed superfluous import. | |
12711 | |
12712 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12713 | |
12714 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
12715 Implementation of a CallContext.Listener to open/close Hibernate | |
12716 Sessions for each request. | |
12717 | |
12718 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12719 | |
12720 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
12721 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
12722 Some modifications related to the last commit - modification of the | |
12723 describe() signature of a State. | |
12724 | |
12725 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
12726 | |
12727 * src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: | |
12728 Removed. We do not need a state to select a gauge - the selection takes | |
12729 place by choosing a start and an end point. | |
12730 | |
12731 2011-04-13 Ingo Weinzierl <ingo@intevation.de> | |
12732 | |
12733 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
12734 Bugfix: added missing label node to root node and a namespace to the | |
12735 data node. | |
12736 | |
12737 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
12738 | |
12739 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
12740 The name of the artifact 'winfo' is written into the DESCRIBE document | |
12741 now. We need this to have a proper way to distinguish between different | |
12742 artifacts in the UI. | |
12743 | |
12744 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
12745 | |
12746 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Bugfix: | |
12747 States are filled with data before they describe themself. | |
12748 | |
12749 2011-04-11 Ingo Weinzierl <ingo@intevation.de> | |
12750 | |
12751 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
12752 New. A factory that returns the annotations of a specific river. | |
12753 | |
12754 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
12755 New. This service provides a document that contains information about | |
12756 distances of a river. | |
12757 | |
12758 * doc/conf/conf.xml: Registered the DistanceInfoService. | |
12759 | |
12760 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
12761 | |
12762 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12763 This collection overrides the out() operation now. The incoming request | |
12764 document is read and the related OutGenerator is used to create the | |
12765 output. | |
12766 | |
12767 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
12768 the code to create discharge curves. It has moved to the | |
12769 DischargeCurveGenerator which now does this work. | |
12770 | |
12771 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
12772 | |
12773 * src/main/java/de/intevation/flys/exports/OutGenerator.java: The | |
12774 generate() method throws an IOException now. | |
12775 | |
12776 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
12777 New. This OutGenerator creates discharge curves. | |
12778 | |
12779 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
12780 | |
12781 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
12782 the visibility of the getData() method. It's now public, because the | |
12783 OutGenerator needs an artifact's data. | |
12784 | |
12785 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12786 | |
12787 * src/**/*.java: Removed trailing whitespace. | |
12788 | |
12789 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12790 | |
12791 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12792 Make project compilable again by | |
12793 commenting out a not existing XMLDebug reference. | |
12794 | |
12795 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
12796 | |
12797 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
12798 Added code to parse the configured OutGenerators and to save them (in a | |
12799 map) in the FLYSContext. | |
12800 | |
12801 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
12802 Added a key that is used to save the OutGenerators Map in the context. | |
12803 | |
12804 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
12805 | |
12806 * src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
12807 New. This interface is used to generator different types of output. | |
12808 ArtifactCollections will make use of this interface to create a | |
12809 collected output of all its artifacts. | |
12810 | |
12811 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
12812 | |
12813 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12814 Removed the Backend from FLYSArtifactCollection - used ArtifactDatabase | |
12815 operations instead. | |
12816 | |
12817 * TODO: Removed 'remove Backend reference' TODO. | |
12818 | |
12819 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
12820 | |
12821 * doc/conf/artifacts/winfo.xml: Enhanced the configuration of the | |
12822 discharge curve output mode. This output now provides three facets - W, | |
12823 Q and the curve itself. | |
12824 | |
12825 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
12826 | |
12827 Tagged RELEASE 0.1 | |
12828 | |
12829 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
12830 | |
12831 * doc/conf/artifacts/winfo.xml: Renamed an output mode in the WINFO | |
12832 artifact configuration. | |
12833 | |
12834 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
12835 | |
12836 * src/main/resources/messages_de_DE.properties, | |
12837 src/main/resources/messages_de.properties: Changed a german string. | |
12838 | |
12839 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
12840 | |
12841 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
12842 Modified the available calculation modes and its order in the DESCRIBE | |
12843 document. | |
12844 | |
12845 * src/main/resources/messages.properties, | |
12846 src/main/resources/messages_de_DE.properties, | |
12847 src/main/resources/messages_en.properties, | |
12848 src/main/resources/messages_de.properties: Adapted the names of | |
12849 calculation modes. | |
12850 | |
12851 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
12852 | |
12853 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12854 Added the hash code of an artifact to the artifact part of the | |
12855 collection's DESCRIBE document. | |
12856 | |
12857 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
12858 | |
12859 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Changed | |
12860 the background color of discharge curves to white. | |
12861 | |
12862 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12863 | |
12864 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12865 Cache the scale, too. Otherwise two calls to getValues() with | |
12866 different arguments will result in the same output. | |
12867 | |
12868 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
12869 | |
12870 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12871 Introduced a 'scale' parameter in the getValues() method. | |
12872 | |
12873 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Filled | |
12874 the out() operation with code that draws a discharge table of one or | |
12875 more gauges specified by the given range in entered in a previous state. | |
12876 | |
12877 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
12878 | |
12879 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
12880 New. A helper class to exports charts. | |
12881 | |
12882 * pom.xml: Added dependencies to iText, Batik and JFreeChart. | |
12883 | |
12884 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12885 | |
12886 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
12887 Fixed swap of operands. | |
12888 | |
12889 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12890 | |
12891 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
12892 New. Load gauges for a river and filter them for given | |
12893 ranges. | |
12894 | |
12895 2011-03-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12896 | |
12897 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12898 Store data in a double [][] instead of interleaved double [] | |
12899 to be compatible with org.jfree.data.xy.DefaultXYDataset. | |
12900 | |
12901 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
12902 | |
12903 * TODO: Removed 'i18n' and 'step-back' TODOs and added an issue to remove | |
12904 the Backend reference from FLYSArtifactCollection. | |
12905 | |
12906 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
12907 | |
12908 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12909 Added missing artifact namespace of an attribute in the DESCRIBE | |
12910 document. | |
12911 | |
12912 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
12913 | |
12914 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
12915 New. This ArtifactCollection overrides the DefaultArtifactCollection to | |
12916 implement FLYS specific describe() and out() operations. | |
12917 | |
12918 * doc/conf/conf.xml: Use the FLYSArtifactCollection instead of the | |
12919 DefaultArtifactCollection for this application. | |
12920 | |
12921 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
12922 | |
12923 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
12924 New. Fetches values of discharge tables in form of packed | |
12925 w/q double arrays for given gauges. | |
12926 | |
12927 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
12928 Removed needless import. | |
12929 | |
12930 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
12931 | |
12932 * src/main/resources/messages_de_DE.properties: Added a german resource | |
12933 bundle to avoid exceptions in the flys artifacts. Sometimes, the | |
12934 Resources class is not able to find a 'de_DE' bundle and throws an | |
12935 exception. This is really strange, because it should use the 'de' bundle | |
12936 in that case, but it doesn't. | |
12937 | |
12938 2011-03-23 Ingo Weinzierl <ingo@intevation.de> | |
12939 | |
12940 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
12941 some code to append the output modes of previous states to the DESCRIBE | |
12942 document. | |
12943 | |
12944 TODO: Determine if the current state is already filled with data and | |
12945 append its output modes as well! | |
12946 | |
12947 2011-03-22 Ingo Weinzierl <ingo@intevation.de> | |
12948 | |
12949 * doc/conf/artifacts/winfo.xml: Enhanced the location_distance state with | |
12950 an output mode 'discharge_table'. | |
12951 | |
12952 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
12953 | |
12954 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
12955 Write human readable strings as label attribute into the DESCRIBE | |
12956 output. Those labels are used to be displayed in the GUI. | |
12957 | |
12958 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
12959 | |
12960 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
12961 Added some further calculation types. | |
12962 | |
12963 * src/main/resources/messages.properties, | |
12964 src/main/resources/messages_en.properties, | |
12965 src/main/resources/messages_de.properties: Added i18n strings for the | |
12966 calculation types | |
12967 | |
12968 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
12969 | |
12970 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
12971 Implemented the step-back part of the advance() operation. | |
12972 | |
12973 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
12974 | |
12975 * src/main/resources/messages_de.properties: Fixed a german umlaut. | |
12976 | |
12977 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
12978 | |
12979 * doc/conf/artifacts/winfo.xml: Added new states for entering a | |
12980 location/distance and w/q. | |
12981 | |
12982 * src/main/resources/messages.properties, | |
12983 src/main/resources/messages_en.properties, | |
12984 src/main/resources/messages_de.properties: New string for the | |
12985 location/distance and w/q input states. | |
12986 | |
12987 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
12988 | |
12989 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
12990 New. A state for the W/Q input of the WINFO parameterization. | |
12991 | |
12992 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
12993 | |
12994 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
12995 Append an attribute 'uiprovider' to the dynamic UI node. | |
12996 | |
12997 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
12998 New. A state for the location/distance selection of the WINFO | |
12999 parameterization. | |
13000 | |
13001 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13002 | |
13003 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13004 Added a new method getUIProvider() that might be overriden by concreted | |
13005 subclasses that should be rendered with a specific UIProvider. | |
13006 | |
13007 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13008 | |
13009 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
13010 The static UI part is created by the previous states now. This makes it | |
13011 possible to group the data objects (which is necessary to group the | |
13012 objects in the ui). | |
13013 | |
13014 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13015 Added a describeStatic() method that creates a node that contains the | |
13016 data of that state. | |
13017 | |
13018 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
13019 | |
13020 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13021 Removed TODO: the document contains the rivers provided by the backend | |
13022 now. | |
13023 | |
13024 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13025 | |
13026 * pom.xml: Added dependency to flys backend. | |
13027 | |
13028 * src/main/java/de/intevation/flys/artifacts/model/River.java: | |
13029 Removed. We are using the backend model now. | |
13030 | |
13031 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
13032 Fetches the rivers from the backend. | |
13033 | |
13034 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13035 Import fixes. | |
13036 | |
13037 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13038 | |
13039 * doc/conf/conf.xml: Added section for database backend configuration. | |
13040 | |
13041 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13042 | |
13043 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13044 Fixed build error coming from different import of XMLUtils. | |
13045 | |
13046 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13047 | |
13048 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13049 Appended the missing label node that contains the human readable name of | |
13050 the data item. | |
13051 | |
13052 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13053 | |
13054 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
13055 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13056 I18N of strings for the DESCRIBE document. | |
13057 | |
13058 * src/main/resources/messages.properties, | |
13059 src/main/resources/messages_en.properties, | |
13060 src/main/resources/messages_de.properties: I18N strings for the | |
13061 calculcation mode state. | |
13062 | |
13063 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13064 | |
13065 * doc/conf/artifacts/winfo.xml: Modified the winfo states. | |
13066 | |
13067 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Adapted | |
13068 the artifact regarding the changes of the last commit. The states | |
13069 describe() method creates the dynamic UI node - the artifact needs to | |
13070 apply this node. | |
13071 | |
13072 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
13073 New. The state for choosing the calculation mode. | |
13074 | |
13075 * src/main/resources/messages.properties, | |
13076 src/main/resources/messages_en.properties, | |
13077 src/main/resources/messages_de.properties: Added i18n strings for the | |
13078 calculation mode state. | |
13079 | |
13080 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13081 | |
13082 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
13083 New. This is the base state for the FLYS application. It provides a | |
13084 method that creates the dynamic ui node for the DESCRIBE. | |
13085 | |
13086 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
13087 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: Both | |
13088 classes extend the abstract base class DefaultState. | |
13089 | |
13090 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
13091 | |
13092 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
13093 New. This class retrieves the i18n strings from a ResourceBundle. | |
13094 | |
13095 * src/main/resources/messages.properties, | |
13096 src/main/resources/messages_en.properties, | |
13097 src/main/resources/messages_de.properties: Resource files for german and | |
13098 english translation. | |
13099 | |
13100 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13101 | |
13102 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
13103 the data that have been inserted in former states into the static node | |
13104 of the DESCRIBE. | |
13105 | |
13106 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13107 | |
13108 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
13109 operations feed() and advance() return the description of the artifact | |
13110 using the describe() operation. This avoids additional server round trips | |
13111 in the client - the clients gets to know about the new state of the | |
13112 artifact immediately. | |
13113 | |
13114 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
13115 | |
13116 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13117 Implemented a part (step forward) of the advance operation. | |
13118 | |
13119 * TODO: Implement Step-Back in advance operation. | |
13120 | |
13121 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13122 | |
13123 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
13124 Implemented the abstract method getName(). It returns the constant | |
13125 'winfo' string. | |
13126 | |
13127 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
13128 Implemented the feed action. The data of an incoming feed() operation is | |
13129 stored in StateData objects that are saved in a map in the artifact. | |
13130 | |
13131 NOTE: There is no input validation and no i18n of error messages (see | |
13132 TODO). | |
13133 | |
13134 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13135 | |
13136 * TODO: This file contains some open points that need to be done. | |
13137 | |
13138 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
13139 | |
13140 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New. This | |
13141 artifact serves as the default artifact for the FLYS application. | |
13142 | |
13143 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: This | |
13144 artifact now inherits from FLYSArtifact. Furthermore, there is one big | |
13145 change: we don't store the State objects itself in the artifact, but | |
13146 just the identifier of those. This makes the artifact smaller and more | |
13147 compatible agains previous versions of the software. | |
13148 | |
13149 2011-03-08 Ingo Weinzierl <ingo@intevation.de> | |
13150 | |
13151 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
13152 New. This service will retrieve a list of provided rivers. | |
13153 | |
13154 * doc/conf/conf.xml: Added a configuration for the RiverService. | |
13155 | |
13156 2011-03-07 Ingo Weinzierl <ingo@intevation.de> | |
13157 | |
13158 * doc/conf/conf.xml: Added a section user-factory and collection-factory in | |
13159 the factories part of the configuration. | |
13160 | |
13161 2011-03-01 Ingo Weinzierl <ingo@intevation.de> | |
13162 | |
13163 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13164 Replaced the 'special' attribute from DESCRIBE with a 'uiprovider' | |
13165 attribute. | |
13166 | |
13167 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
13168 | |
13169 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
13170 RiverSelect state is called to create the UI part of the describe | |
13171 document. | |
13172 | |
13173 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
13174 Implemented the dynamic UI part of describe(). The static part is not | |
13175 inserted into the describe document at the moment. We need a reference to | |
13176 the previous states for this. | |
13177 | |
13178 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
13179 | |
13180 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
13181 src/main/java/de/intevation/flys/artifacts/model/River.java: New. A model | |
13182 class that represents a river and its factory to create concrete river | |
13183 instances. | |
13184 NOTE: Currently, this is just a mockup. The factory just returns two | |
13185 static rivers "Mosel" and "Saar" without a connection to a backend. | |
13186 | |
13187 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13188 | |
13189 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: The | |
13190 input data of a state is initialized with empty StateData objects after | |
13191 the State has been created. | |
13192 | |
13193 * doc/conf/artifacts/winfo.xml: Renamed the input data nodes of the states | |
13194 which now fits better to the class name of the implementation. | |
13195 | |
13196 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13197 | |
13198 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
13199 describe document returned by this artifact now contains the current state | |
13200 and the reachable states. | |
13201 | |
13202 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
13203 | |
13204 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13205 The transitions are put into the TransitionEngine with the ID of the state | |
13206 - not longer with the artifact name. On this way, we are able to fetch | |
13207 just the transitions for a specific state, instead of all the transitions | |
13208 of an artifact. | |
13209 | |
13210 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13211 | |
13212 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Describe() | |
13213 returns the artifact's uuid and hash value. The whole implementation of | |
13214 describe() is still outstanding. | |
13215 | |
13216 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13217 | |
13218 * doc/conf/artifacts/winfo.xml: Removed useless config stuff. | |
13219 | |
13220 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
13221 useless methods, and improved the init process - the first state is set as | |
13222 the current state for this artifact. | |
13223 | |
13224 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
13225 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: New. | |
13226 The states are used in the first two steps of the WINFOArtifact. | |
13227 Currently, they just implement stubs of the necessary methods setup() and | |
13228 describe(). | |
13229 | |
13230 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
13231 | |
13232 * src/main/java/de/intevation/flys/artifacts/states/State.java, | |
13233 src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java, | |
13234 src/main/java/de/intevation/flys/artifacts/transitions/Transition.java: | |
13235 Removed. These classes are placed in the artifact-database now. | |
13236 | |
13237 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java, | |
13238 src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
13239 Adapted imports of Transition. | |
13240 | |
13241 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: New. | |
13242 This factory should be used to create concrete State objects. | |
13243 | |
13244 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
13245 a constant key to store the StateEngine in the context. | |
13246 | |
13247 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13248 New method that initializes the states at application start. | |
13249 | |
13250 2011-02-03 Ingo Weinzierl <ingo@intevation.de> | |
13251 | |
13252 * src/main/java/de/intevation/flys/artifacts/states/State.java: New. The | |
13253 interface description of a state. | |
13254 | |
13255 * src/main/java/de/intevation/flys/artifacts/transitions/Transition.java, | |
13256 src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
13257 New. The interface description and a default implementation of a | |
13258 transition. | |
13259 | |
13260 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java: | |
13261 New. The TransitionEngine stores all transitions for each artifact and | |
13262 should be used to determine, if an artifact can advance from one state to | |
13263 another. | |
13264 | |
13265 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
13266 New. Transitions should be created by using this class. | |
13267 | |
13268 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: New. | |
13269 The Flys context. It currently defines keys to store important components | |
13270 in the context. | |
13271 | |
13272 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
13273 New. The context factory initializes the basic components of the | |
13274 application. Currently, the TransitionEngine is created and all artifacts | |
13275 with its transitions are read from the global configuration and stored in | |
13276 the FLYSContext. | |
13277 | |
13278 * pom.xml: Added a dependency to the 'artifacts-common' package. | |
13279 | |
13280 * doc/conf/artifacts/winfo.xml: Corrected the classname of the | |
13281 DefaultTransition. | |
13282 | |
13283 * doc/conf/conf.xml: Added FLYSContextFactory as context-factory. | |
13284 | |
13285 2011-02-02 Ingo Weinzierl <ingo@intevation.de> | |
13286 | |
13287 * doc/conf/conf.xml: An initial configuration file for the FLYS artifact | |
13288 server. | |
13289 | |
13290 * doc/conf/artifacts/winfo.xml: An initial transition configuration of an | |
13291 WINFO artifact. | |
13292 | |
13293 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: A stub of | |
13294 an artifact for a WINFO parameterization. | |
13295 | |
13296 * pom.xml: Set the source code version to 1.5. | |
13297 | |
13298 2011-02-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13299 | |
13300 * src/**, pom.xml: Added initial maven project. | |
13301 * ChangeLog: new. |