Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 3806:881fcd01e056
merged flys-artifacts/pre2.6-2011-11-04
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Sep 2012 12:14:50 +0200 |
parents | c35ef7f4b88f |
children | f68d6dcaea94 |
comparison
equal
deleted
inserted
replaced
3802:e831dc29e572 | 3806:881fcd01e056 |
---|---|
1 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2 | |
3 Fix flys/issue406 (Themestyle-editor: themes for "other.wkms" and | |
4 "other.wqkms" missing) | |
5 | |
6 * doc/conf/themes.xml: Fixed typos in WKms and WQKms theme names. | |
7 | |
8 2011-11-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
9 | |
10 Fix flys/issue405 (Datacage: Recommendations get loaded twice). | |
11 | |
12 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java | |
13 (setup): Do not try/catch exception. | |
14 (spawn_state): Generate just one "general" output. | |
15 | |
16 2011-11-08 Ingo Weinzierl <ingo@intevation.de> | |
17 | |
18 * doc/conf/meta-data.xml: Removed orphaned datacage configuration which is | |
19 no longer loadable. | |
20 | |
21 2011-11-04 Ingo Weinzierl <ingo@intevation.de> | |
22 | |
23 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Create | |
24 line and polygon layers for barriers only if they are really existing. | |
25 | |
26 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
27 | |
28 Disable mainvalue-recommendations for discharge curves as they trigger | |
29 a yet-to-be understood NPE. | |
30 | |
31 * doc/conf/meta-data.xml: Comment mainvalue-recommendations for | |
32 discharge curves. | |
33 | |
34 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
35 | |
36 Added new matching condition for theme-mappings: the name of | |
37 the output. | |
38 | |
39 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
40 Added output field and function to match it against a given | |
41 output name. | |
42 | |
43 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
44 Createing ThemeMapping with output attribute from configuration. | |
45 | |
46 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
47 (getTheme(FLYSContext, string)): Removed, never called. | |
48 (getTheme): Added outputName argument, match it. | |
49 | |
50 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
51 Pass outputs name until it can be matched against mapping. | |
52 | |
53 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
54 | |
55 * doc/conf/themes.xml: Added default themes for other.w(q)kms. | |
56 | |
57 2011-11-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
58 | |
59 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
60 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
61 Cosmetics, reduce logging noise. | |
62 | |
63 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
64 | |
65 Added access to static W_Q_Kms - data in much the same way then static | |
66 WKms. | |
67 | |
68 * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: | |
69 Cache Key for static wqkms data. | |
70 | |
71 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: | |
72 Facet for WQKms. | |
73 | |
74 * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: | |
75 Factory to access WQKms. | |
76 | |
77 * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: | |
78 Artifact that provides 'static' WQKms. | |
79 | |
80 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
81 Added STATIC_WQKMS type. | |
82 | |
83 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
84 | |
85 * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: | |
86 New. Maps series to zero to be compatible with XYDifferenceRenderer. | |
87 It returns an iterator over XYDatasets to enable splitting by NaNs, | |
88 which still needs to be implemented. | |
89 | |
90 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
91 Uses a XYDatasetToZeroMapper now. Fixed package name. | |
92 | |
93 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
94 | |
95 Added new matching options for theme-mappings to allow more | |
96 overspecification of defaults (e.g. now name,description-pattern and | |
97 master-artifacts attributes are matched). The first full match from | |
98 the configuration file is done. | |
99 New matching option in the masterAttr- field of a mapping are | |
100 super-basic until new use-cases come up. | |
101 Concrete new themes are point-styles of Ws when locations where chosen | |
102 to calculate. | |
103 | |
104 * doc/conf/themes.xml: Added newly defined Themes. | |
105 | |
106 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
107 Put master-artifact in flys-context. | |
108 | |
109 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: | |
110 Accept masterAttr in constructor. | |
111 (masterAttrMatches): New, check masterAttr-condition against | |
112 artifact. | |
113 | |
114 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
115 When creating ThemeMappings, pass in masterAttr. | |
116 | |
117 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: | |
118 (getTheme): Evaluate masterAttr-condition, always return first full | |
119 match. | |
120 | |
121 2011-11-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
122 | |
123 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
124 Added ARTIFACT key, documentation. | |
125 | |
126 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
127 | |
128 * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: | |
129 New. At the moment a pure copy of JFreeChart's XYDifferenceRenderer. | |
130 Needs to be refactored to cope with its limitations: | |
131 | |
132 - Series numbers need to be zero based. We have more than two series | |
133 in our diagrams. | |
134 | |
135 - Cannot handle definition holes indicated by NaNs. We have these | |
136 cases e.g. more than one "Fliessbereich". | |
137 | |
138 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
139 | |
140 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
141 Reenabled dumping data to disk. | |
142 | |
143 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
144 | |
145 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
146 Removed superfluous import. | |
147 | |
148 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
149 | |
150 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
151 Use new pair in stack of results and connections because they are | |
152 always used in pairs. Maintaining two separate stacks is not | |
153 needed any longer. | |
154 | |
155 2011-11-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
156 | |
157 * src/main/java/de/intevation/flys/utils/Pair.java: New. A generic pair. | |
158 | |
159 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
160 Rewritten to useful as test bed for "Raum/Flaeche" operations. | |
161 | |
162 2011-11-02 Ingo Weinzierl <ingo@intevation.de> | |
163 | |
164 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added | |
165 setter methods for all parameters and removed the constructors. There is | |
166 just an empty constructor - all parameters need to be set via setter | |
167 methods. | |
168 | |
169 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified the | |
170 creation of LayerInfo objects. | |
171 | |
172 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: | |
173 Removed, because the internal structure and constructors of LayerInfo have | |
174 changed, so that we gonna use LayerInfo for all layers now. | |
175 | |
176 * doc/conf/themes.xml: Modified the color definitions of | |
177 'floodmap.riveraxis' and 'floodmap.kms' themes and added a 'symbol' field | |
178 to 'floodmap.kms'. | |
179 | |
180 * doc/conf/mapserver/symbols.sym, | |
181 doc/conf/mapserver/fontset.txt: New. Required by Mapserver. | |
182 | |
183 * doc/conf/mapserver/db_layer.vm: Added an 'EXTENT' field that is filled | |
184 using LayerInfo.getExtent(). | |
185 | |
186 * doc/conf/mapserver/mapfile.vm: Modified FONTSET directory and added a | |
187 SYMBOLSET. | |
188 | |
189 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added an | |
190 abstract method getGeometryType(). | |
191 | |
192 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override | |
193 getGeometryType() of WMSDBArtifact. This Artifact provides "POINT"s. | |
194 | |
195 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
196 Create new WMSDBLayerFacets with geometry type "LINE". | |
197 | |
198 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
199 Added a 'geometryType' attribute and getter/setter methods. This attribute | |
200 determines the type of geometry provided by this database wms layer. Types | |
201 could be "POLYGON", "POINT", "LINE" and so on. | |
202 | |
203 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
204 Added a 'symbol' attribute to the inner class Clazz. | |
205 | |
206 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a function to | |
207 parse the symbol field of a theme. This symbol is used for | |
208 MapserverStyle.Clazz. | |
209 | |
210 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
211 | |
212 Apply point theme to heightmarks when imported in longitudinal | |
213 section diagram. | |
214 | |
215 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
216 Added new FacetType HEIGHTMARK_POINTS. | |
217 | |
218 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
219 Allow name to be given in constructor. | |
220 | |
221 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
222 If heightmarks were loaded, give respective name in WKmsFacet | |
223 generation. | |
224 | |
225 * doc/conf/themes.xml: Added virtual "Points" and concrete | |
226 heightmark_points - theme. | |
227 | |
228 * doc/conf/artifacts/winfo.xml: Made longitudinal_section output | |
229 compatible with heightmarks_points. | |
230 | |
231 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
232 Render heightmarks like other wkms. | |
233 | |
234 * doc/conf/meta-data.xml: Changed heightmark ids such that it can be | |
235 identified in StaticWKmsFacet . | |
236 | |
237 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
238 | |
239 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
240 Documentation added. | |
241 | |
242 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
243 | |
244 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
245 Fix bug where (wrong) active-attribute was set, doc. | |
246 | |
247 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
248 | |
249 Refactoring to allow mainvalues in both discharge and computed | |
250 discharge curve diagrams. | |
251 | |
252 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java | |
253 (addPointsQW): New helper function. | |
254 | |
255 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
256 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
257 Moved doMainValueQAnnotations, doMainValueWAnnotations from child- | |
258 to parent-class, extracetd doDischargeOut. Use | |
259 StyledSeriesBuilder.addPointsQW . | |
260 | |
261 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
262 | |
263 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
264 Removed logger/debugging noise. | |
265 | |
266 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
267 | |
268 1) Pass outputs name to artifacts getInitialFacetActivity(). | |
269 2) Do not allow "gaps" in positions of facets in outputs in attributes | |
270 of collection (prevent e.g. positions 1,3,5; will become 1,2,3 | |
271 instead). | |
272 | |
273 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
274 Pass outputname to artifacts getInitialFacetActivity(), prevent | |
275 gaps in facets positions in outputs (1,3,10 become 1,2,3). | |
276 | |
277 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
278 | |
279 1) Give Artifacts information about the out when they have to decide | |
280 whether a given facet is initially in/active by adding parameter | |
281 to getInitialFacetActivity(+outputName). | |
282 2) Generate separate Set of MainValueFacets for discharge curves. | |
283 | |
284 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
285 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
286 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
287 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
288 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
289 (getInitialFacetActivity): Adjusted, new parameter outputName. | |
290 Added MAINVALUES_{Q,W} definition. | |
291 | |
292 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
293 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
294 Accept name in constructor. | |
295 | |
296 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
297 Create second pair of MainValuesFacets, give distinguishable names. | |
298 | |
299 2011-11-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
300 | |
301 Added compatibility of (computed)discharge-curve diagrams with | |
302 mainvalues. | |
303 | |
304 * doc/conf/artifacts/winfo.xml: Added mainvalues to compatibility list | |
305 of (computed) discharge curve outputs. These facet-definitionss can | |
306 differ in names because we can can have up to 4 mainvalue facets in | |
307 one state. | |
308 | |
309 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
310 | |
311 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Determine | |
312 the extent of such WMS layer based on the list of RiverAxisKm objects | |
313 returned by the backend. | |
314 | |
315 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
316 | |
317 * doc/conf/meta-data.xml: Added a datacage node that represents a | |
318 kilometer WMS layer. | |
319 | |
320 * doc/conf/conf.xml: Added a new Artifact WMSKmArtifact. | |
321 | |
322 * doc/conf/themes.xml: Added a style for 'floodmap.kms' facets. | |
323 | |
324 * doc/conf/artifacts/winfo.xml: Defined 'floodmap.kms' as valid floodmap | |
325 facet. | |
326 | |
327 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
328 a 'floodmap.kms' facet. | |
329 | |
330 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method to | |
331 determine the srid of a river based on its name. | |
332 | |
333 * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: New. This | |
334 Artifact should act as base Artifact for WMS layers that represent data | |
335 from database datastore. | |
336 | |
337 * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: New. This | |
338 Artifact is used to generate facets for kilometer WMS layers. | |
339 | |
340 * src/main/resources/messages.properties, | |
341 src/main/resources/messages_de_DE.properties, | |
342 src/main/resources/messages_en.properties, | |
343 src/main/resources/messages_de.properties: Added default descriptions | |
344 for 'floodmap.kms' facets. | |
345 | |
346 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
347 | |
348 Fix incompilability. | |
349 | |
350 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
351 Adjust to changed CrossSectionFacet. | |
352 | |
353 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
354 | |
355 Minor preparations to handle multiple cross sections in one | |
356 diagram/artifact, faking certain aspects (e.g. ability to display | |
357 multiple cross sections, but let these fetch the exactly same data | |
358 for now). | |
359 | |
360 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
361 Parameterize but fake access to cross-section (always take first | |
362 one). | |
363 (getCrossSectionName,getCrossSectionNames): Renamed, access names | |
364 of all cross-sections, so that at least facets with different names | |
365 are created (they will still deliver the same data). | |
366 | |
367 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
368 Allow indexing. | |
369 | |
370 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
371 Index created cross-sections. | |
372 | |
373 2011-11-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
374 | |
375 Show multiple water lines and facets in cross-section diagram if | |
376 multiple waterlevel values had been entered. | |
377 | |
378 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java | |
379 (appendBackgroundActivity): Made static. | |
380 (getWaterLines): Add 'idx' argument to specify index of queried | |
381 waterlevel. | |
382 | |
383 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
384 Add index. | |
385 | |
386 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
387 Add one Facet for each of the computed waterlevels. | |
388 | |
389 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
390 | |
391 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
392 Added code to calculate intersection points. | |
393 | |
394 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
395 Added polygons for trivial cases. WIP | |
396 | |
397 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
398 | |
399 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
400 Made it compilable again. | |
401 | |
402 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
403 | |
404 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
405 Made X() and Y() access macros public. | |
406 | |
407 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
408 More code. WIP. | |
409 | |
410 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
411 | |
412 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
413 Handle start points when building polygons. Work in progress. | |
414 | |
415 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
416 | |
417 * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: | |
418 New. Vector operations on Point2D. | |
419 | |
420 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
421 Moved vector operations to VectorUtils. | |
422 | |
423 2011-10-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
424 | |
425 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
426 Do not call size() in for loop again and again. | |
427 | |
428 2011-10-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
429 | |
430 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: | |
431 Interim check in. Work in progress. | |
432 | |
433 2011-10-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
434 | |
435 * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: New. | |
436 Polygon class to help creating "Raum/Flaeche" renderers with gaps in | |
437 their definitions. WORK IN PROGRESS! | |
438 | |
439 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
440 | |
441 * doc/conf/themes.xml: Added a default theme for the riveraxis used in the | |
442 floodmap. | |
443 | |
444 * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: | |
445 New. This class is used by ThemeUtil to create a style which is | |
446 compatible for Mapserver- | |
447 | |
448 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a method to | |
449 retrieve a Mapserver compatible style (as string) based on a given | |
450 Document (that comes from CollectionItem's attribute). | |
451 | |
452 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: | |
453 Implemented the setStyle() and getStyle() methods. | |
454 | |
455 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
456 new parameter 'style' to createDatabaseLayer(). This parameter is set on | |
457 LayerInfo. | |
458 | |
459 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create | |
460 Mapserver compatible styles and call createDatabaseLayer() with this | |
461 style. | |
462 | |
463 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
464 | |
465 * doc/conf/artifacts/winfo.xml: Defined "floodmap.riveraxis" and | |
466 "floodmap.wmsbackground" as compatible layers for the floodmap output. | |
467 | |
468 * doc/conf/mapserver/db_layer.vm: New. This layer template is used for | |
469 Mapserver layers with database datastore. | |
470 | |
471 * doc/conf/mapserver/dbconnection.include: New. The database configuration | |
472 used in the db_layer template. | |
473 | |
474 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
475 getUserWMSUrl() that returns the URL to the user specific WMS server. | |
476 This method requires a UUID of an Artifact to identify the owner of the | |
477 Artifact. | |
478 | |
479 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Use | |
480 FLYSUtils.getUserWMSUrl() to create the URL to the user WMS for | |
481 WMSLayerFacets creation. | |
482 | |
483 * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: | |
484 New. Subclasses WMSLayerFacet to save data and filter parameters used | |
485 for database storage in Mapfiles. | |
486 | |
487 * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: New. | |
488 Subclasses LayerInfo to save database relevant parameters. | |
489 | |
490 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
491 Creates new WMSDBLayerFacets, so that the riveraxis layer data is | |
492 fetched from database. | |
493 | |
494 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a | |
495 public method that allows creating layers (type LINE) based on | |
496 WMSDBLayerFacets. | |
497 | |
498 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Enabled | |
499 support for Facets other than "floodmap.wsplgen" and "floodmap.barriers". | |
500 Those other Facets are supposed to be WMSDBLayerFacets. | |
501 | |
502 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
503 | |
504 Refactored, added StyledSeriesBuilder to unify adding points to | |
505 XYSeries. | |
506 | |
507 * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: | |
508 New class to help with adding points to XYSeries. | |
509 | |
510 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
511 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
512 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
513 Use StyledSeriesBuilder to add points to series. | |
514 | |
515 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
516 | |
517 Added DC-conf, such that static data can be loaded from w-difference | |
518 diagrams datacage. | |
519 | |
520 * doc/conf/meta-data.xml: Minor "refactoring" (definition of two | |
521 macros, allow certain static data to be loaded via datacage to | |
522 w-difference diagrams, too. | |
523 | |
524 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
525 | |
526 Load and display annotations in w-differences, minor polishing. | |
527 | |
528 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
529 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
530 Use FacetType 'instead' of string. Allow Annotations in | |
531 WDifferences- diagram. | |
532 | |
533 * doc/conf/meta-data.xml: Recommend annotations in w-differences case. | |
534 | |
535 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
536 | |
537 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
538 Survive case where a given output doesnt exist in compatibility | |
539 matrix. | |
540 | |
541 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
542 | |
543 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
544 Added simpler constructor. | |
545 | |
546 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
547 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
548 Adjusted construction of StaticStates. | |
549 | |
550 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
551 | |
552 * doc/conf/artifacts/winfo.xml: Allow Annotations in longitudinal and | |
553 w-differences diagrams. | |
554 | |
555 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
556 | |
557 Use artifacts configuration (e.g. winfo.xml) to define which facets | |
558 can be used in which output. Hide no-matches. | |
559 | |
560 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
561 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
562 Added use of "compatibility matrix". Only include facets in in | |
563 collections description document that are marked compatible in the | |
564 masterartifacts configuration (e.g. winfo.xml). | |
565 | |
566 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
567 | |
568 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
569 (mergeAttributes, getMasterArtifact): Extraced, updated caller. | |
570 Cosmetics to reduce indentation one step. | |
571 | |
572 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
573 | |
574 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java | |
575 (getStateHistoryIds): New, return list of current and all previous | |
576 state ids. | |
577 | |
578 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
579 | |
580 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
581 Trigger the re-creation of FLYS mapfile if endOfLife() of this state is | |
582 called. | |
583 | |
584 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
585 | |
586 * doc/conf/mapserver/mapfile.vm: The "layers" injected by VelocityEngine is | |
587 now used to include layers. A single string in this list represents the | |
588 path to a file which contains a LAYER section for Mapserver' Mapfile. | |
589 | |
590 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Removed the | |
591 update() call of MapfileGenerator. Mapfiles are generated by MapGenerator | |
592 only which requires a FLYSArtifactCollection.doOut()! | |
593 | |
594 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Call update() | |
595 of MapfileGenerator to trigger the re-creation of mapfile(s). | |
596 | |
597 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Collect all | |
598 LAYER snippets from filesystem and inject the filepath for each snippet | |
599 into the Mapfile template. | |
600 | |
601 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
602 | |
603 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
604 src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java, | |
605 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
606 Cosmetics, doc. | |
607 | |
608 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
609 | |
610 Let OutputParser and AttributeParser collect all facets on the way. | |
611 | |
612 * src/main/java/de/intevation/flys/collections/OutputParser.java, | |
613 src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
614 Collect all facets while iterating over Outputs and Attributes, | |
615 documentation added. | |
616 | |
617 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
618 | |
619 Extracted getFlysContext from FLYSArtifacts into FLYSUtils. | |
620 | |
621 * src/main/java/de/intevation/flys/utils/FLYSUtils.java | |
622 (getFlysContext): Added, extracted from FLYSArtifact. | |
623 | |
624 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
625 (getFlysContext): Moved to FLYSUtils, updated callers. | |
626 | |
627 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
628 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
629 Update callers to getFlysContext. | |
630 | |
631 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
632 | |
633 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: | |
634 Catch IOException - flys-artifacts compiles again. | |
635 | |
636 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
637 | |
638 * doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet | |
639 for floodmaps. | |
640 | |
641 * doc/conf/mapserver/shapefile_layer.vm: New. Currently a copy of | |
642 layer.vm. This template will evolve to a special mapserver layer | |
643 template with a shapefile data source. | |
644 | |
645 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Fixed broken | |
646 facet name of barriers. | |
647 | |
648 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added | |
649 public methods for creating wsplgen and barriers layer files for | |
650 mapserver. | |
651 | |
652 * src/main/java/de/intevation/flys/exports/MapGenerator.java: Use | |
653 MapfileGenerator to create new layer files for wsplgen and barriers. | |
654 | |
655 2011-10-28 Ingo Weinzierl <ingo@intevation.de> | |
656 | |
657 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new | |
658 method gerRiverBoundary() which returns an Envelope object (which | |
659 represents the bounding box of a Geometry) of a riveraxis specified by its | |
660 rivername. | |
661 | |
662 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: Use | |
663 Geometry.getRiverBoundary() to determine the max extent of a river. | |
664 | |
665 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, | |
666 src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Use | |
667 JTS Envelope to save the bounding boxes of WMS layers. | |
668 | |
669 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
670 Adapted the code to apply the changes in GeometryUtils (use Envelope to | |
671 determine the max extent of the river axis). | |
672 | |
673 * src/main/java/de/intevation/flys/exports/MapGenerator.java: New (work in | |
674 progress). This Generator will currently return a map configuration in XML | |
675 which consists of parameters required by OpenLayers to create a map. | |
676 | |
677 * doc/conf/conf.xml: Registered the new MapGenerator. | |
678 | |
679 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
680 | |
681 * doc/conf/meta-data.xml: Do not recommend historical data to load | |
682 when having computational discharge curves. | |
683 | |
684 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
685 | |
686 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
687 Reduce noise, given "error" message was more of "debug" nature. | |
688 | |
689 2011-10-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
690 | |
691 Restore mapping of state id to facets (essentially revert, revision | |
692 3083 and 3088). | |
693 | |
694 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
695 (getInitialFacetActivity): Be more explicit on which facets to | |
696 introduce inactivated. | |
697 | |
698 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
699 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
700 Minor refactoring, declare a string final static. | |
701 | |
702 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
703 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
704 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
705 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
706 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
707 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
708 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
709 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, | |
710 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
711 Restore association from state id to facets. | |
712 | |
713 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
714 | |
715 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
716 src/main/java/de/intevation/flys/collections/OutputParser.java: | |
717 Cosmetics, documentation. | |
718 | |
719 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
720 | |
721 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
722 Prepare rendering of "other/static wkms" (functional) and | |
723 w-differences (not yet fully functional). | |
724 | |
725 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
726 | |
727 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
728 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
729 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
730 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
731 Cosmetics. | |
732 | |
733 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
734 | |
735 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
736 Do not store facets in a map from stateId to list of facets, but in | |
737 a pure list instead. | |
738 | |
739 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
740 | |
741 * doc/conf/artifacts/winfo.xml: Adjusted to newer semantics, | |
742 minor cleanups. | |
743 | |
744 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
745 | |
746 Resolve association of facets to states in artifacts. This eases | |
747 merging of outputs and facets and inhibition of unwanted outputs | |
748 substiantially (at the price of slightly more expensive merging). | |
749 Also, the semantics of artifacts configuration files (e.g. winfo.xml) | |
750 is changed (facet elements within an output elements are used for | |
751 merging). | |
752 | |
753 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
754 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, | |
755 src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
756 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
757 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
758 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
759 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
760 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
761 Do not store facets in a map from stateId to list of facets, but in | |
762 a pure list instead. | |
763 | |
764 2011-10-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
765 | |
766 * doc/conf/meta-data.xml: Added dc configuration for some data | |
767 that can be loaded from longitudinal section diagrams. | |
768 | |
769 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
770 | |
771 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
772 Cosmetics, docs. | |
773 | |
774 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
775 | |
776 Let Qs in Longitudinal Diagram be inactive, initally. | |
777 | |
778 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
779 (getInitialFacetActivity): Do not let Facets ending with a 'q' | |
780 enter in active state. | |
781 | |
782 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
783 | |
784 * doc/conf/meta-data.xml: Fix broken datacage config. | |
785 | |
786 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
787 | |
788 * doc/conf/meta-data.xml: Configured to include correct id to | |
789 clone artifact that produces w-diff. | |
790 | |
791 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
792 | |
793 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
794 Revert correct behaviour of Annotations (the small axis tick shall | |
795 always be drawn). Minor refactoring. | |
796 | |
797 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
798 | |
799 * doc/conf/meta-data.xml: Added configuration to include differences | |
800 in datacage when longitudinal sections are shown (yet not | |
801 functional). | |
802 | |
803 2011-10-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
804 | |
805 * doc/conf/meta-data.xml: Cosmetics. | |
806 | |
807 2011-10-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
808 | |
809 * doc/conf/themes.xml: Added theme for w_differences facets. | |
810 | |
811 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java | |
812 (createSecondAxisRange): Survive parameter-nullness for now. | |
813 Added documentation. | |
814 | |
815 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
816 | |
817 * src/main/java/de/intevation/flys/themes/ThemeAccess.java: | |
818 New. Caching wrapper around an XML document theme. It uses ThemeUtil | |
819 to access the values and stores them in instance variable. | |
820 Background: ThemeUtil use XPath a lot which is expensive. | |
821 | |
822 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java, | |
823 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
824 Use ThemeAccess to style the annotations. | |
825 | |
826 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
827 Removed some XPath strings. They are in ThemeUtil. | |
828 | |
829 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
830 | |
831 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
832 Added methods to parse further attributes. | |
833 | |
834 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
835 Apply the theme attributes and use ThemeUtils to get the attribute values. | |
836 | |
837 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
838 Removed the spamy debug output. | |
839 | |
840 2011-10-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
841 | |
842 To obtain the size of a diagram it is rendered twice. The | |
843 second time the generated image is omitted so the concrete | |
844 rendered image is not needed. To save CPU cycles in this pass | |
845 the image is rendered to to /dev/null Graphics2D object. | |
846 | |
847 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
848 Added boolean system property "info.rendering.nop.graphics" (default: false). | |
849 With this property set the info rendering is done via a new | |
850 NOPGraphics2D opbject which does not render the image. | |
851 | |
852 * src/main/java/de/intevation/flys/java2d/NOPGraphics2D.java: | |
853 New. Implements java.awt.Graphics2D trivial empty methods. | |
854 This prevents rendering. | |
855 | |
856 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
857 Commented out spamy debug output | |
858 | |
859 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
860 | |
861 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
862 Draw the text background and use orientation attribute. | |
863 | |
864 2011-10-21 Raimund Renkert <raimund.renkert@intevation.de> | |
865 | |
866 * doc/conf/themes.xml: | |
867 Renamed 'textbackground' to 'backgroundcolor' to have 'color' in the | |
868 attribute name. | |
869 | |
870 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
871 Process text attributes correctly. | |
872 | |
873 2011-10-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
874 | |
875 * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: | |
876 New. Service to lookup the Nth nearest neighbors for a set of given | |
877 cross section ids and kms. | |
878 | |
879 * doc/conf/conf.xml: Registered service. | |
880 | |
881 * doc/conf/cache.xml: Cache config. | |
882 | |
883 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, | |
884 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
885 Removed superfluous imports. | |
886 | |
887 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
888 | |
889 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
890 Added methods to extract further attributes from theme. | |
891 | |
892 2011-10-20 Ingo Weinzierl <ingo@intevation.de> | |
893 | |
894 * doc/conf/themes.xml: Added main value themes for longitudinal section | |
895 charts. | |
896 | |
897 * src/main/java/de/intevation/flys/themes/ThemeMapping.java: New. This | |
898 class stores the name of a facet, the related theme and a pattern | |
899 string. | |
900 | |
901 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
902 Read the pattern string and store a list of ThemeMapping objects in the | |
903 FLYSContext. | |
904 | |
905 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Modified | |
906 getTheme() which now takes the FLYSContext, the name of a facet and an | |
907 optional pattern string. Now, we can have specialized Themes for each | |
908 chart type. E.g. the facet "longitudinal_section.w" maps the default | |
909 Theme for W lines in longitudinal section charts. If the optional | |
910 pattern string matches the pattern ".*(HQ1000)(\D.*)*", the ThemeFactory | |
911 will return the Theme "LongitudinalSectionW_HQ1000". | |
912 | |
913 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
914 Use the description of a facet as pattern string to get the relevant | |
915 Theme from ThemeFactory. | |
916 | |
917 2011-10-20 Raimund Renkert <raimund.renkert@intevation.de> | |
918 | |
919 * doc/conf/themes.xml: | |
920 Added new theme attributes. | |
921 | |
922 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
923 | |
924 Fix WDifference plots where masterartifact has no range set. | |
925 | |
926 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
927 (addSubtitles): Overridden, the master artifact has no | |
928 range. | |
929 | |
930 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
931 | |
932 Fix masterartifact in collections in cases where the original | |
933 masterartifacts facets do not come first in certain list. Query | |
934 'backend'/db instead. | |
935 | |
936 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
937 Set 'real' master artifact, defined to be oldest belonging to this | |
938 collection. | |
939 | |
940 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
941 | |
942 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
943 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
944 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
945 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
946 Modified the method signature of createStaticData() which now also | |
947 requires a FLYSArtifact. | |
948 | |
949 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
950 Override createStaticData() to create titles for Qs manually - we want | |
951 to display the named main values if existing for the selected Qs. | |
952 | |
953 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
954 | |
955 * doc/conf/themes.xml: | |
956 ComputedDischargeCurveW and ComputedDischargeCurveQ inherit attributes from | |
957 theme 'Text'. | |
958 | |
959 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
960 | |
961 Fix for flys/issue316 | |
962 | |
963 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added | |
964 constructor to not sort the data. | |
965 | |
966 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
967 Use the not sorting constructor of StyledXYSeries. | |
968 | |
969 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
970 | |
971 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
972 moved the code to create WSP W and Q facet names to FLYSUtils. | |
973 | |
974 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New functions for | |
975 creating WSP W and Q facet names and for querying a named main value | |
976 based on a given gauge and value. The names of W and Q facets will now | |
977 depend on the selected Q and Q mode: if the mode is "q at gauge" and a | |
978 named value is found for the given value, the facet's name contains the | |
979 named value instead of the value itself. | |
980 | |
981 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
982 | |
983 Fix datacage configuration to let client load ZUS and flood | |
984 protections. | |
985 | |
986 * doc/conf/meta-data.xml: Use 'ids' instead of 'id' to help client. | |
987 | |
988 2011-10-19 Raimund Renkert <raimund.renkert@intevation.de> | |
989 | |
990 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
991 Added methods to parse text attributes from theme document. | |
992 | |
993 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, | |
994 src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
995 Apply a theme to axis annotations. | |
996 | |
997 2011-10-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
998 | |
999 Create (data) Label from data string (client will be adjusted to send | |
1000 the name). | |
1001 | |
1002 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
1003 Create label from input data string, documentation added, junk | |
1004 removed. | |
1005 | |
1006 2011-10-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1007 | |
1008 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java(zoom): | |
1009 Do not crash if no axis is given. | |
1010 | |
1011 2011-10-19 Ingo Weinzierl <ingo@intevation.de> | |
1012 | |
1013 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added | |
1014 getFormat() which extracts the format string from XML request document. | |
1015 | |
1016 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: Adapted | |
1017 method signatures of exportImage(), exportSVG() and exportPDF(). All | |
1018 methods now take a CallContext object which stores extra chart export | |
1019 parameters. | |
1020 | |
1021 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1022 Enabled PDF and SVG chart exports based on the "format" string given in | |
1023 the XML request document. | |
1024 | |
1025 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1026 | |
1027 Simplify rendereing W(Q)Kms in WDifferencesCurveGenerator. | |
1028 | |
1029 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1030 (doWOut, doWOut): Simplified. | |
1031 | |
1032 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1033 | |
1034 Render zus and flood-protections in WDifferences-diagrams. | |
1035 | |
1036 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1037 Added basic respect of "other.wkms"- facets. | |
1038 | |
1039 | |
1040 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1041 | |
1042 Adjusted Datacage-Configuration to fetch "extra longitudinal...." | |
1043 (.zus) - waterlevels in certain case (in system-part). | |
1044 | |
1045 * doc/conf/meta-data.xml: Adjusted to present extra-kms with | |
1046 staticwkms factory in certain case. | |
1047 | |
1048 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
1049 | |
1050 * doc/conf/themes.xml: | |
1051 Added new virtual theme for text with the attributes 'font', 'textcolor' | |
1052 and 'textsize'. | |
1053 | |
1054 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1055 | |
1056 Give StaticWKmsArtifacts proper names, and pre-deselect them. | |
1057 | |
1058 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
1059 (getInitialFacetActivity): Overridden to let facets enter plot | |
1060 inactively. | |
1061 (setup): Give Facets the name of the Wst. | |
1062 | |
1063 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
1064 Refactored to expose getWKmsName separately. | |
1065 | |
1066 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1067 | |
1068 Adjusted Datacage-Configuration to fetch flood-protections when | |
1069 waterlevels are requested (in system-part). | |
1070 | |
1071 * doc/conf/meta-data.xml: Adjusted to present flood-protections with | |
1072 staticwkms factory in certain case. | |
1073 | |
1074 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1075 | |
1076 Register staticwkms factory. | |
1077 | |
1078 * doc/conf/conf.xml: Register staticwkms factory to spawn StaticWKms- | |
1079 Artifacts. | |
1080 | |
1081 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1082 | |
1083 Fetch name of static WKms. | |
1084 | |
1085 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
1086 Removed dependence on "kind", but fetch name for created WKms. | |
1087 | |
1088 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
1089 Remove dependence on Kind. | |
1090 | |
1091 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1092 | |
1093 Store parameterization in data, not in Artifact. | |
1094 | |
1095 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
1096 Resolve col_pos and wst_id field, use data instead. | |
1097 | |
1098 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1099 | |
1100 Add convenience-method to add defaultdata (string). | |
1101 | |
1102 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
1103 (addStringData): Add Default (String) Data . | |
1104 | |
1105 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1106 | |
1107 Add a new Artifact and Facet (StaticWKmsArtifact, WKmsFacet) to | |
1108 access WKms obtainable with the WKmsFactory. | |
1109 | |
1110 * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: | |
1111 New, artifact with single state to get WKms from WKmsFactory. | |
1112 | |
1113 * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: | |
1114 New Facet to display W over km. | |
1115 | |
1116 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
1117 Added new type name. | |
1118 | |
1119 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1120 | |
1121 Add WKMsFactory to access 'static' wst-data. | |
1122 | |
1123 * src/main/java/de/intevation/flys/artifacts/model/StaticWKmsCacheKey.java: | |
1124 Cache Key for the static WKms data. | |
1125 | |
1126 * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: | |
1127 New, creates WKms from wst-id and column. Does not yet fetch the | |
1128 name. | |
1129 | |
1130 * doc/conf/cache.xml: Added cache configuration for static wkms data. | |
1131 | |
1132 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1133 | |
1134 Cosmetics, docs. | |
1135 | |
1136 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
1137 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
1138 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
1139 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1140 src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: | |
1141 Cosmetics, docs. | |
1142 | |
1143 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1144 | |
1145 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
1146 Added constructor that takes name, docs. | |
1147 | |
1148 2011-10-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1149 | |
1150 Fix issue that Annotations do not come with theme/style. | |
1151 | |
1152 * doc/conf/themes.xml: Added "Annotations" default style. | |
1153 | |
1154 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1155 Set style of annotations, minor cosmetics. | |
1156 | |
1157 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1158 | |
1159 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1160 Made inner class ThemeList static. | |
1161 s/new Integer(small)/Integer.valueOf(small)/ | |
1162 | |
1163 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
1164 | |
1165 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1166 The inner class ThemeList makes now use of ManagedDomFacet to read the | |
1167 attributes of Facets saved in the Collection's attribute. | |
1168 | |
1169 2011-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1170 | |
1171 flys/issue314: Variables in datacage are now case insensitive. | |
1172 (H2 returns meta data variables uppercase) | |
1173 | |
1174 * doc/conf/meta-data.xml: | |
1175 Made a statement more precise. Added some debug output. | |
1176 | |
1177 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
1178 Use uppercase variable names. | |
1179 | |
1180 * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, | |
1181 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
1182 src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, | |
1183 src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
1184 Variables are now treated as uppercase. | |
1185 | |
1186 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
1187 Input variables are now treated uppercase. | |
1188 | |
1189 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
1190 | |
1191 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
1192 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
1193 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
1194 Prepared Facets to support a "visible" attribute. | |
1195 | |
1196 * src/main/java/de/intevation/flys/collections/OutputParser.java: Adapted | |
1197 the constructor call of ManagedFacetAdapter. | |
1198 | |
1199 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1200 The inner class ThemeList now supports the "visible" attribute of | |
1201 ManagedFacets. | |
1202 | |
1203 2011-10-17 Raimund Renkert <raimund.renkert@intevation.de> | |
1204 | |
1205 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: | |
1206 Added method to apply line type. | |
1207 | |
1208 * doc/conf/themes.xml: | |
1209 Changed initial default value for line type. | |
1210 | |
1211 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
1212 | |
1213 flys/issue226 (W-INFO: Dauerlinienberechung /Abbbildung x-Achse) | |
1214 | |
1215 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
1216 Set the upper bound of these charts to 364. | |
1217 | |
1218 2011-10-17 Ingo Weinzierl <ingo@intevation.de> | |
1219 | |
1220 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
1221 Added a function that returns a Gauge based on its name. | |
1222 | |
1223 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
1224 Create proper descriptions for facets. | |
1225 | |
1226 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Added a | |
1227 setter for labels. | |
1228 | |
1229 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
1230 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
1231 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1232 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1233 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
1234 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1235 Use the string returned by Facet.getDescription() as series names. The | |
1236 ThemePanel and the Legend will always display the same titles for curves | |
1237 now. | |
1238 | |
1239 | |
1240 2011-10-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1241 | |
1242 Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). | |
1243 | |
1244 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
1245 (parseLineWidth): New. Get line width from Document. | |
1246 | |
1247 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1248 When adding annotations, parse line width from theme, set it. | |
1249 | |
1250 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
1251 When painting, set Paint and stroke early enough. | |
1252 | |
1253 2011-10-14 Ingo Weinzierl <ingo@intevation.de> | |
1254 | |
1255 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Put the | |
1256 config directory into the Velocity context. It is available as | |
1257 '$CONFIGDIR' in templates. | |
1258 | |
1259 * doc/conf/mapserver/mapfile.vm: Set the debug file to | |
1260 "$CONFIGDIR/flys-user-wms.log" and added a LEGEND section. | |
1261 | |
1262 * doc/conf/mapserver/wsplgen_class.vm: Adapted the class names. Those | |
1263 names are displayed in the image served by GetLegendGraphic. | |
1264 | |
1265 2011-10-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1266 | |
1267 Add possibility of programmatic configuration of initial "activity" | |
1268 state (active or inactive) of (Managed)Facets by introducing | |
1269 FLYSArtifact.getInitialFacetActivity. This method shall be overriden | |
1270 by subclasses where Facets are wanted to come to live inactive. | |
1271 Artifacts will be asked only once how the MangedFacet should come to live, | |
1272 namely when AttributeWriter finds a genuinely new Facet. | |
1273 | |
1274 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
1275 src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java | |
1276 (getInitialFacetActivity): | |
1277 New function to let Artifact decide whether a ManagedFacet shall | |
1278 initially be set to active or inactive. | |
1279 | |
1280 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
1281 Accept database in constructor. For genuinely new Facets, spawn its | |
1282 mother artifact and ask whether the (Managed)Facet shall be active | |
1283 or inactive (initially). | |
1284 | |
1285 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java | |
1286 (buildOutAttributes): Pass database to AttributeWrite (which needs it | |
1287 to spawn artifacts), rename items parameter to reflect content. | |
1288 | |
1289 2011-10-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1290 | |
1291 Cosmetics, removed obsolete imports. | |
1292 | |
1293 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, | |
1294 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1295 Removed obsolete imports. | |
1296 | |
1297 2011-10-12 Ingo Weinzierl <ingo@intevation.de> | |
1298 | |
1299 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
1300 Added a further attribute "mark.selected" to the barriers feature type. | |
1301 This attribute is used in the client, where we are not able to remove it | |
1302 properly. Reading the GeoJSON string without this attribute is no longer | |
1303 possible... strange! | |
1304 | |
1305 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1306 | |
1307 Added i18n for label of wdiff "pair select" states data. | |
1308 | |
1309 * src/main/resources/messages.properties, | |
1310 src/main/resources/messages_de_DE.properties, | |
1311 src/main/resources/messages_en.properties, | |
1312 src/main/resources/messages_de.properties: Added i18n for | |
1313 state.winfo.waterlevel_pair_select . | |
1314 | |
1315 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1316 | |
1317 Addressed "Wrong labels" [6] part of flys/issue371 (W-INFO / Differenzen: | |
1318 Anmerkungen zur Umsetzung) . | |
1319 | |
1320 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
1321 Adjusted variable names to avoid conflict in subclasses, adjusted | |
1322 default value for i18n string. | |
1323 | |
1324 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1325 | |
1326 Cosmetics, docs. | |
1327 | |
1328 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
1329 Cosmetics: Space after full stop in commments, slightly improved | |
1330 documentation, added one debug message. | |
1331 | |
1332 2011-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1333 | |
1334 Fix remainder of flys/issue304 (Erweiterte Funktionen W-Differenzen) . | |
1335 | |
1336 * doc/conf/artifacts/winfo.xml: Removed obsolete data of | |
1337 WDifferencesState. | |
1338 | |
1339 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
1340 Re-enable facet-filtering, but adjust filters before that happens | |
1341 (former longitudinal_section output is now w_differences output). | |
1342 | |
1343 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1344 | |
1345 Added wdiff-chart translations. | |
1346 | |
1347 * src/main/resources/messages.properties, | |
1348 src/main/resources/messages_de_DE.properties, | |
1349 src/main/resources/messages_en.properties, | |
1350 src/main/resources/messages_de.properties: Added i18n for wdiff. | |
1351 | |
1352 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1353 | |
1354 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1355 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1356 Expose translateable Strings as constants. | |
1357 | |
1358 2011-10-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1359 | |
1360 Fix most labels in w-differences charts. | |
1361 | |
1362 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1363 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1364 Remove most static final i18n-variables in favor of direct String | |
1365 usage or usage of methods. By this, allow easier adoption of labels | |
1366 in subclasses. | |
1367 | |
1368 2011-10-11 Ingo Weinzierl <ingo@intevation.de> | |
1369 | |
1370 flys/issue383 (Zweite Y-Achse wird beim Zoomen/Verschieben nicht angepasst.) | |
1371 | |
1372 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1373 Call adjustAxes() before applying zoom settings with autoZoom(). We need | |
1374 to add new y-axes first before we adjust their ranges. | |
1375 | |
1376 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1377 | |
1378 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1379 s/new Integer(small)/Integer.valueOf(small)/ | |
1380 | |
1381 2011-10-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1382 | |
1383 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
1384 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1385 Do not fire change events for each and every data point added. | |
1386 | |
1387 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1388 | |
1389 Fix WDifferences with more than one Pair (crashed due to incorrect index for | |
1390 facets.) | |
1391 | |
1392 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
1393 Fix wrong index for difference facets (allows for more than one | |
1394 difference facet per artifact without crashes). | |
1395 | |
1396 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1397 | |
1398 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1399 Use slightly modified doWOut-implementation from | |
1400 LongitudinalSectionGenerator (here need to add Ws to different axis). | |
1401 | |
1402 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1403 | |
1404 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
1405 Fix import/reference. | |
1406 | |
1407 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1408 | |
1409 Let WaterlevelPairSelectState include diffids-data (if any) to enable | |
1410 future work on repopulation of Grid in GUI when jumping back | |
1411 (reparameterization). | |
1412 | |
1413 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
1414 (createItems): Override to include old data. | |
1415 | |
1416 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
1417 | |
1418 flys/issue150 (Diagramm: Anzeige von W bergauf) | |
1419 flys/issue345 (W-INFO / Wasserspiegellagenberechnung, Diagrammausgabe) | |
1420 | |
1421 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1422 Corrected the determination to invert the x axis, so that waterlines | |
1423 will start with their highest value at the left and end with their | |
1424 lowest values at the right. | |
1425 | |
1426 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1427 | |
1428 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
1429 Cosmetics, added an (@Override) annotation. | |
1430 | |
1431 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java, | |
1432 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
1433 Cosmetics, added documentation. | |
1434 | |
1435 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
1436 Cosmetics, whitespace after full stops in comments, added | |
1437 (@Override) annotation. | |
1438 | |
1439 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
1440 | |
1441 flys/issue220 (Diagramm: Achsenbeschriftungen an verschiedenen Achsen müssen gleich aussehen) | |
1442 | |
1443 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
1444 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1445 Adjusted the label font of the 2nd y-axis - now, both axes labels look | |
1446 equal. | |
1447 | |
1448 2011-10-10 Ingo Weinzierl <ingo@intevation.de> | |
1449 | |
1450 flys/issue189 (WINFO/Dauerlinie: Sortierung der Berechnungsausgabe nach Dauerzahlen aufsteigend) | |
1451 | |
1452 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: Added a | |
1453 method that determines if the items (days) in this object are increasing | |
1454 or not. | |
1455 | |
1456 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
1457 Changed the order of the CSV export - the highest day is at the top of | |
1458 the export; the lowest day is at the bottom. | |
1459 | |
1460 2011-10-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1461 | |
1462 Worked on flys/issue150 (Diagramm: Anzeige von W bergauf). | |
1463 Still does not work in all cases. | |
1464 | |
1465 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java (generateChart()): | |
1466 Reordered calls to ensure that the inversion of the x axis is | |
1467 not eliminated by other chart generation steps as a side effect. | |
1468 | |
1469 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1470 Assuming that JFreeChart is inverting axis automatically if the | |
1471 KMs are reversed ordered only do invert only in some situations. | |
1472 | |
1473 Do not invert axis for Q (@Ingo: This is wrong! We must do this | |
1474 if we are only displaying the Qs and the Ws are deactived). | |
1475 | |
1476 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
1477 | |
1478 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1479 Take care on empty ranges while preparing ranges for single points. | |
1480 | |
1481 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
1482 | |
1483 flys/issue114 (W-INFO: Wasserspiegellagenberechnung / Ort (Spezialfall: Generierung eines Diagramms bei punkthafter Berechnung)) | |
1484 | |
1485 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Expand | |
1486 ranges for x and y axes if there is just a single point in a series - | |
1487 JFreeChart requires a range where lower <> upper. | |
1488 | |
1489 2011-10-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1490 | |
1491 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, | |
1492 src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java, | |
1493 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
1494 src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1495 Add whitespace after full stop in comments, minor doc improvements. | |
1496 | |
1497 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
1498 | |
1499 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
1500 | |
1501 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1502 Adapted the process of collecting outs for Artifacts/Facets. We will now | |
1503 call OutGenerator.doOut() for each Artifact and Facet - never mind if | |
1504 the facet is activated (visible) or not. The OutGenerator should decide | |
1505 on its own whtat to do with facets which are "marked" as _not_ visible. | |
1506 | |
1507 * src/main/java/de/intevation/flys/exports/OutGenerator.java, | |
1508 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
1509 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1510 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
1511 src/main/java/de/intevation/flys/exports/ReportGenerator.java, | |
1512 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, | |
1513 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
1514 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
1515 src/main/java/de/intevation/flys/exports/ATExporter.java, | |
1516 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
1517 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
1518 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
1519 src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
1520 Adapted the signature of OutGenerator.doOut(). There will be a new | |
1521 boolean parameter "visible" that determines if the facet specified in | |
1522 this method is visible for this output or not. | |
1523 | |
1524 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Now, | |
1525 that we walk over every Artifact/Facet, we are able to collect min/max | |
1526 data for all axes. We store these information and use them to set the | |
1527 ranges of x and y axes. The result of this: a chart can have proper axes | |
1528 set without any data in it. | |
1529 | |
1530 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Use | |
1531 min/max ranges stored while calling doOut() for each Artifact/Facet | |
1532 instead of fetching those information from chart's Datasets (which could | |
1533 be null). | |
1534 | |
1535 2011-10-07 Ingo Weinzierl <ingo@intevation.de> | |
1536 | |
1537 * src/main/java/de/intevation/flys/utils/Formatter.java: Changed the max | |
1538 number of digits for AT exports from 0 to 2. | |
1539 | |
1540 2011-10-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1541 | |
1542 * src/main/java/de/intevation/flys/exports/ATWriter.java: Get rid | |
1543 of buggy first line code. | |
1544 | |
1545 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1546 | |
1547 fixed flys/issue201 | |
1548 | |
1549 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
1550 Replace >= with > in km index lookup because last km was not found. | |
1551 | |
1552 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1553 | |
1554 fixed flys/issue177 | |
1555 | |
1556 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
1557 Revert rev2245. Code works fine now! :-) | |
1558 | |
1559 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
1560 | |
1561 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Stores a | |
1562 list of XYTextAnnotations instead of FLYS specific Annotations. This | |
1563 makes this class suitable for other annotation types as well. | |
1564 | |
1565 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
1566 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
1567 Both facets' getData() will now return an instance of FLYSAnnotation. | |
1568 | |
1569 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
1570 Create XYTextAnnotations used to instantiate an object of | |
1571 FLYSAnnotation. | |
1572 | |
1573 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
1574 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1575 Removed the code to add annotations to the plot. This task is general | |
1576 enough to move this code to parent class. | |
1577 | |
1578 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1579 Instances of this class are now able to store - besides first and second | |
1580 axes datasets - a list of annotations. This annotations are added to the | |
1581 plot after the datasets have been added. To support LegendItems for | |
1582 those annotions, it was necessary to create a the LegendItemCollection | |
1583 by ourself. This work is done while applying the themes for each series | |
1584 in the chart. | |
1585 | |
1586 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1587 | |
1588 Removed code duplication of guessWaterIncreasing() | |
1589 | |
1590 * src/main/java/de/intevation/flys/artifacts/model/WKms.java(allKms, allWs): | |
1591 Added methods to fetch all kms and all ws. | |
1592 | |
1593 * src/main/java/de/intevation/flys/utils/DataUtil.java: Generalized to | |
1594 get WKms as arguments. | |
1595 | |
1596 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
1597 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, | |
1598 src/main/java/de/intevation/flys/artifacts/model/WQ.java: Implements | |
1599 the extended WKms interface. | |
1600 | |
1601 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1602 Uses the generalized DataUtil.guessWaterIncreasing(). | |
1603 | |
1604 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
1605 | |
1606 flys/issue347 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
1607 flys/issue303 (Keine Streckenfavoriten, wenn nur Q im Längsschnittdiagram ausgewählt) | |
1608 flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) | |
1609 | |
1610 * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: New. A | |
1611 wrapper for Annotations which allows us to provide a description for a | |
1612 set of annotations. | |
1613 | |
1614 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: | |
1615 The getData() will now return an instance of FLYSAnnotation that wraps | |
1616 the Annotations returned by the AnnotationArtifact. The lebel of | |
1617 FLYSAnnotation is the description of this Facet. | |
1618 | |
1619 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1620 Modified the way to add Annotations. We will no longer create an empty | |
1621 series to support a LegendItem for a set of Annotations, but we will add | |
1622 a LegendItem manually to the LegendItemCollection of the plot. In | |
1623 addition, we are now able to display annotations if one of the two | |
1624 y-axes are missing. If there are no y-axes existing, we are not able to | |
1625 display annotations yet. | |
1626 | |
1627 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1628 | |
1629 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
1630 Lifted the wrong point. Now all backjump corrections look fine. :-) | |
1631 | |
1632 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
1633 | |
1634 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
1635 Fixed bugs and make use of a cache for annotations now. | |
1636 | |
1637 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1638 | |
1639 Worked on flys/issue31 | |
1640 | |
1641 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
1642 Simplified the code a lot. Needs testing. Maybe flys/issue31 is gone | |
1643 | |
1644 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1645 | |
1646 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1647 Fetch the WstUnit value from river - the Wst itself no longer supports a | |
1648 Unit iself. | |
1649 | |
1650 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1651 | |
1652 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, | |
1653 src/main/java/de/intevation/flys/utils/DoubleUtil.java: Moved some generic | |
1654 double array code to DoubleUtil. | |
1655 | |
1656 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1657 | |
1658 * src/main/java/de/intevation/flys/utils/DoubleUtil.java (interpolateSorted): | |
1659 Added code to linear interpolate double values in a sorted array. | |
1660 Keys and values are given as double arrays. Keys need to be sorted. | |
1661 | |
1662 2011-10-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1663 | |
1664 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
1665 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
1666 Removed superfluous imports. | |
1667 | |
1668 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1669 | |
1670 flys/issue330 (Dauerlinie kann nicht berechnet werden) | |
1671 | |
1672 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
1673 Add a problem if no data was found for duration curves. | |
1674 | |
1675 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1676 | |
1677 * src/main/java/de/intevation/flys/themes/Theme.java, | |
1678 src/main/java/de/intevation/flys/themes/DefaultTheme.java: Added | |
1679 getter/setter methods to provide a facet (string) and index (int). Both | |
1680 values are written as attribute to the Theme's XML representation. | |
1681 | |
1682 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
1683 Set the "facet" and "index" values of themes. | |
1684 | |
1685 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1686 | |
1687 flys/issue346 (W-INFO / Anzeige der Höheninformation) | |
1688 | |
1689 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1690 Modified x and y axis title. The x axis title is now "RIVERNAME-km"; the | |
1691 y axis title is now "W[WST_UNIT]" where WST_UNIT depends on the unit of | |
1692 the WST. | |
1693 | |
1694 * src/main/resources/messages.properties, | |
1695 src/main/resources/messages_de_DE.properties, | |
1696 src/main/resources/messages_en.properties, | |
1697 src/main/resources/messages_de.properties: Modified i18n expressions for | |
1698 x and y axis of longitudinal section charts. | |
1699 | |
1700 2011-09-30 Ingo Weinzierl <ingo@intevation.de> | |
1701 | |
1702 flys/issue351 (W-INFO / Wasserspiegellagenberechnungen) | |
1703 | |
1704 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: Modified the | |
1705 explode() function that returns a list of values specified by min, max | |
1706 and an interval. If the last value, determined by the interval, is | |
1707 bigger than the max value, it is not included in the result list. | |
1708 | |
1709 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1710 | |
1711 flys/issue334 (Querprofil-Diagramm: Ausgabe dieses Diagrammtyps | |
1712 möglich, obwohl WSP Berechnung keine Ergebnisse liefert) | |
1713 | |
1714 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
1715 (compute): Add Facets regarding CrossSections only if data available. | |
1716 | |
1717 2011-09-29 Ingo Weinzierl <ingo@intevation.de> | |
1718 | |
1719 flys/issue176 (Diagramm: Benennung eines Abflusses bei gewählter Höhe am Pegel) | |
1720 flys/issue349 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) | |
1721 | |
1722 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
1723 Create titles for W and Q waterlevel facets with proper fractions. | |
1724 | |
1725 2011-09-30 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1726 | |
1727 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
1728 (createStaticData, getLabels): Create proper labels for differences. | |
1729 | |
1730 2011-09-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1731 | |
1732 flys/issue244 (WINFO: Export von AT-Dateien im ersten Teil unterschiedlich) | |
1733 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
1734 | |
1735 * src/main/java/de/intevation/flys/exports/ATWriter.java: Due to a rounding | |
1736 issue the w's of the first line underun the minimal w of the curve at times. | |
1737 An extra test was introduced to suppress the output of the q's of the wrong w's. | |
1738 | |
1739 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1740 | |
1741 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
1742 Use StringUtil.wWrap , fix wrong loop, minor refac and cosmetics. | |
1743 | |
1744 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1745 | |
1746 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
1747 Extracted/use StringUtil.wWrap . | |
1748 | |
1749 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
1750 | |
1751 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
1752 Log the gauge which has been determined. | |
1753 | |
1754 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
1755 | |
1756 flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) | |
1757 | |
1758 * src/main/java/de/intevation/flys/exports/ATExporter.java: Store the | |
1759 master Artifact which is set via setMasterArtifact(). This is required | |
1760 for meta information used while preparing the header row of AT exports. | |
1761 | |
1762 * src/main/java/de/intevation/flys/exports/ATWriter.java: Print a header | |
1763 row into the AT export for being compatible with desktop FLYS. | |
1764 | |
1765 * src/main/resources/messages.properties, | |
1766 src/main/resources/messages_de_DE.properties, | |
1767 src/main/resources/messages_en.properties, | |
1768 src/main/resources/messages_de.properties: Added header row for AT | |
1769 export files. | |
1770 | |
1771 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
1772 | |
1773 flys/issue328 (W-INFO / ÜSK: Auswahl der Wasserspiegellage / Auswahlunterstützung) | |
1774 | |
1775 * doc/conf/meta-data.xml: Added an out 'waterlevels' that might be used to | |
1776 fetch user specific waterlevels (same as longitudinal sections, but | |
1777 without Q facet). | |
1778 In addition, the system specific datacage stuff is now fetched, when: | |
1779 a) no user-id is given | |
1780 b) a user-id is given and there is a parameter 'load-system' | |
1781 | |
1782 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
1783 If the label of the WQKms object specified by the waterlevel selection | |
1784 begins with a "Q", the label is wrapped into a "W()", e.g. "W(Q=1200)". | |
1785 | |
1786 2011-09-28 Ingo Weinzierl <ingo@intevation.de> | |
1787 | |
1788 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Made | |
1789 feed() able to remove existing data items from Artifact's data pool. | |
1790 Therefore, the value for the item which should be removed needs to an | |
1791 empty string. | |
1792 | |
1793 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1794 | |
1795 Extracted StringUtil.unbracket from WaterlevelSelectState.strip. | |
1796 | |
1797 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
1798 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
1799 Extract and use StringUtil.unbracket, minor doc. | |
1800 | |
1801 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1802 | |
1803 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
1804 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
1805 Changed access of getCurrentState() from protected to public. | |
1806 | |
1807 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: We | |
1808 use the configured Outputs instead of the actuel Outputs of an Artifact | |
1809 to make recommendations, now. This has the bad side effect of giving | |
1810 recommendations for Outputs that we might _NOT_ be able to produce. But | |
1811 otherwise, we would not be able to give recommendations for states with | |
1812 long calculation times that start background threads for calculation (as | |
1813 WSPLGEN caluclations does). | |
1814 | |
1815 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1816 | |
1817 Enable "auto-scaling" axis for waterlevels in WDifference-plots. | |
1818 | |
1819 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
1820 (createSecondaryAxis, zoomY): Refactored to allow modification in | |
1821 siblings. | |
1822 | |
1823 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1824 (createSecondaryAxisRange): Override to achieve expected behavior. | |
1825 Also adjusted label. | |
1826 | |
1827 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1828 | |
1829 In W-Difference Calculation, respect indices of selected facets. | |
1830 | |
1831 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
1832 (computeAdvance): Respect index of selected facets. | |
1833 | |
1834 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1835 | |
1836 flys/issue317: (Querprofil-Diagramm: Referenzen auf CrossSectionApp entfernen) | |
1837 | |
1838 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
1839 Removed dependency to demo app. | |
1840 | |
1841 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
1842 Refactored to use logic from the models. | |
1843 | |
1844 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
1845 Moved some logic from the demo app to this model. | |
1846 | |
1847 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1848 | |
1849 * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: New. Code | |
1850 from FloodMapState moved to its own class with the intent, to use it in | |
1851 classes different from FloodMapState. | |
1852 | |
1853 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
1854 Removed the inner class FacetCreator. | |
1855 | |
1856 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
1857 an instance of FacetCreator. | |
1858 NOTE: Maybe we should move the WSPLGEN parameters into an own class | |
1859 which might be serializable. | |
1860 | |
1861 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use the | |
1862 FacetCreator instance stored in the WSPLGENJob to create a new WSPLGEN | |
1863 facet if the calculation was successfully (without errors). Finally, the | |
1864 facets of FacetCreator are added to the Facet list of the FLYSArtifacts. | |
1865 | |
1866 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1867 | |
1868 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
1869 Put Artifact in background mode first before starting WSPLGEN, otherwise | |
1870 a very fast errors (call CallContext.afterBackground() before Artifact is | |
1871 in Background mode) might lead to an inconsistent state. | |
1872 | |
1873 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Repaired | |
1874 broken error num parsing. | |
1875 | |
1876 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1877 | |
1878 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Track | |
1879 critical errors as well (improved regular expression for errors). | |
1880 | |
1881 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1882 | |
1883 * ChangeLog: Fixed whitespace usage. | |
1884 | |
1885 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1886 | |
1887 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java, | |
1888 src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java | |
1889 src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, | |
1890 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1891 Removed superfluous imports. | |
1892 | |
1893 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1894 | |
1895 flys/issue68 (Diagramm: Werte an der Y-Achse benötigen i18n) | |
1896 | |
1897 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
1898 method to retrieve the current/preferred locale specified by CallMeta. | |
1899 | |
1900 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
1901 Introduced two methods localizeDomainAxis() and localizeRangeAxis(). | |
1902 Both methods of this class override the NumberFormat used to format axes | |
1903 numbers. Those methods are called by localizeAxes() - which has private | |
1904 access - for each domain and range axis of the current XYPlot. | |
1905 | |
1906 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1907 | |
1908 * doc/conf/cache.xml: Number of cached annotations was much | |
1909 to low. | |
1910 | |
1911 2011-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1912 | |
1913 Improved w-differences diagram generation where multiple differences | |
1914 can be shown. | |
1915 | |
1916 * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: | |
1917 New facet type. | |
1918 | |
1919 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
1920 Employ new DifferenceCurveFacet, return CalculationResult that can | |
1921 store more than one WKms. | |
1922 | |
1923 2011-09-27 Ingo Weinzierl <ingo@intevation.de> | |
1924 | |
1925 flys/issue320 (ÃœSK:Mapserver hat Probleme beim Shapefilepath mit "../" im Pfad) | |
1926 | |
1927 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Use | |
1928 File.getCanonicalPath() to substitute "../" in shapefile directories. | |
1929 | |
1930 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
1931 | |
1932 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
1933 The extent of the WSPLGEN result layer is now specified by the extent of | |
1934 the CrossSectionTracks that matches the start and end kilometer of the | |
1935 WSPLGEN calculation. | |
1936 | |
1937 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New function | |
1938 that creates the OpenLayers bounding box based on two Geometries. | |
1939 | |
1940 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1941 | |
1942 Improved w-differences diagram generation with included "absolute" | |
1943 values. | |
1944 | |
1945 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
1946 Fixed one (of two) incorrect labels. | |
1947 (doWaterlevelOut): Survive non-found gauge, fetch kilometer and w | |
1948 instead of values for w and q. | |
1949 | |
1950 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1951 | |
1952 Add positional-conflict-awareness when merging Facets for a | |
1953 FLYSArtifactCollection. First come first serve. | |
1954 | |
1955 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
1956 (writeFacets): First, sort incoming facets into 2 groups: | |
1957 "genuinely new" and "already there", then for each new check | |
1958 whether the position is already taken. If so, push "up" (position++) | |
1959 until no conflict exists anymore. | |
1960 | |
1961 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
1962 | |
1963 flys/issue296 (Karte: Bezeichnungen verbessern) | |
1964 | |
1965 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
1966 I18N of the WSPLGEN and barriers facets (WMS layers). | |
1967 | |
1968 * src/main/resources/messages.properties, | |
1969 src/main/resources/messages_de_DE.properties, | |
1970 src/main/resources/messages_en.properties, | |
1971 src/main/resources/messages_de.properties: Added strings for the wsplgen | |
1972 and barriers WMS layers. | |
1973 | |
1974 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1975 | |
1976 Fix (revert) access to position in ManagedDomFacet. | |
1977 | |
1978 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
1979 (getPosition): Do not add prefix when querying position ("pos") | |
1980 attribute, add a logger for faster future debugging. | |
1981 | |
1982 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1983 | |
1984 Squash positional conflict-bug. | |
1985 | |
1986 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
1987 (mergeFacets): Removed, replaced in parts by pickFacet. | |
1988 (pickFacet): New, return facet to be added to document. | |
1989 Documentation added. | |
1990 | |
1991 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1992 | |
1993 Squash a bug about wrongly named "art:pos" attribute in ManagedDomFacet (was | |
1994 "pos"). Added documentation from commit message. | |
1995 | |
1996 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
1997 Added documentation (commit message with minor adjustments). | |
1998 (getPosition, setPosition): Include PREFIX in attribute name. | |
1999 | |
2000 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2001 | |
2002 Refactoring, doc. | |
2003 | |
2004 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
2005 (mergeFacets): Removed, replaced in parts by pickFacet. | |
2006 (pickFacet): New, return facet to be added to document. | |
2007 Documentation added. | |
2008 | |
2009 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2010 | |
2011 Cosmetics, docs. | |
2012 | |
2013 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
2014 Documentation added. | |
2015 | |
2016 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
2017 | |
2018 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
2019 Subclasses the FLYSService now - this should improve the database | |
2020 connection handling. | |
2021 | |
2022 2011-09-22 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
2023 | |
2024 * doc/mapserver/mosel-mapfile.map: | |
2025 Full blown mosel wms mapfile. | |
2026 | |
2027 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
2028 | |
2029 * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: | |
2030 New. A subclass of DefaultService which is used in FLYS to init and | |
2031 shutdown database connections. | |
2032 | |
2033 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
2034 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
2035 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
2036 Centralized the initialization and shutdown of database connections. | |
2037 These services now subclass FLYSService which handles the database stuff. | |
2038 | |
2039 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: The | |
2040 current database connection is not closed here - this is done in a | |
2041 Service or in the CallContext. | |
2042 | |
2043 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: It's | |
2044 not necessary to create new database connections here. We already have | |
2045 an existing connection which is initialized by CallContext. | |
2046 | |
2047 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
2048 | |
2049 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
2050 Override validate() of parent classes to suppress "step" validation | |
2051 which is not present in this state. | |
2052 | |
2053 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: Added | |
2054 new method validateBounds() which really just validates a boundary | |
2055 without "step" parameter. | |
2056 | |
2057 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2058 | |
2059 Added WaterlevelArtifact to accompany WINFOArtifacts in WDifferencesPlots. | |
2060 | |
2061 * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: | |
2062 New WaterlevelArtifact. | |
2063 | |
2064 * doc/conf/conf.xml: | |
2065 Added configuration for WaterlevelArtifact configuration (path to state-xml) | |
2066 waterlevel-factory. | |
2067 | |
2068 * doc/conf/artifacts/waterlevel.xml: | |
2069 New, trivial state description for Waterlevelartifact. | |
2070 | |
2071 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: | |
2072 New, only state for WaterlevelArtifact. | |
2073 | |
2074 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2075 | |
2076 Cosmetics, docs. | |
2077 | |
2078 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
2079 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
2080 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
2081 Cosmetics, documentation. | |
2082 | |
2083 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2084 | |
2085 Added WaterlevelOut-processing ability to WDifferencesCurveGenerator. | |
2086 | |
2087 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
2088 Process LONGITUDINAL_W facets. | |
2089 | |
2090 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2091 | |
2092 Improved WDifferenceState in preparation to be able to deal with multiple | |
2093 pairs for differences. | |
2094 | |
2095 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2096 Prepare multiple-pairs-case. | |
2097 | |
2098 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
2099 | |
2100 flys/issue315 (Überschwemmungsfläche: String bei Streckenauswahl) | |
2101 | |
2102 * doc/conf/artifacts/winfo.xml: Added a new state for floodmap's range | |
2103 input. This state will accept a km range only, there is no step width. | |
2104 | |
2105 * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: | |
2106 New. The state which is used to enter a km range with step width. | |
2107 | |
2108 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2109 | |
2110 Cosmetics, improved debug output, doc. | |
2111 | |
2112 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
2113 Improved debug output. | |
2114 | |
2115 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
2116 Added documentation. | |
2117 | |
2118 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
2119 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
2120 Removed commented code. | |
2121 | |
2122 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
2123 Whitespace cosmetics. | |
2124 | |
2125 2011-09-21 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2126 | |
2127 Avoid NullPointerException when drawing XYChart without data. | |
2128 | |
2129 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
2130 Guard calls to dataset to avoid NullPointerException. | |
2131 | |
2132 2011-09-21 Ingo Weinzierl <ingo@intevation.de> | |
2133 | |
2134 flys/issue325 (FLYS Client: Auswahl des DGM zeigt numerischen Wert an) | |
2135 | |
2136 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Write | |
2137 a better label for the selected DEM into the static DESCRIBE. Use the | |
2138 name of the DEM file as label instead of the database id. | |
2139 | |
2140 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
2141 | |
2142 * doc/mapserver/fontset.txt: | |
2143 Added initial font set for km_annotation layer. | |
2144 * doc/mapserver/symbols/symbols.sym: | |
2145 Added square symbol for km and fixpoint layer. | |
2146 * doc/mapserver/saar-mapfile.map: | |
2147 Adjust styling in the flys karte-archiv way. | |
2148 | |
2149 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
2150 | |
2151 Tagged RELEASE 2.5 | |
2152 | |
2153 * Changes: Prepared changes for release. | |
2154 | |
2155 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
2156 | |
2157 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
2158 src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, | |
2159 src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, | |
2160 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
2161 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
2162 needless imports. | |
2163 | |
2164 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
2165 | |
2166 * doc/conf/meta-data.xml: Improved datacage configuration for DEMs. | |
2167 | |
2168 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2169 Query DGMs by the given ID in the FLYS data pool - not by given range | |
2170 values. | |
2171 | |
2172 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
2173 | |
2174 * doc/conf/meta-data.xml: Added a section for DEMs to the floodmap | |
2175 section. | |
2176 | |
2177 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2178 | |
2179 Fix build. | |
2180 | |
2181 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
2182 Fix build. | |
2183 | |
2184 2011-09-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2185 | |
2186 Take a given WaterlevelPair-String, load artifact and plot the diff. | |
2187 | |
2188 * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: | |
2189 Load correct artifacts. | |
2190 | |
2191 2011-09-16 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
2192 | |
2193 * doc/mapserver/*: Added inital mapserver configuration files. | |
2194 | |
2195 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
2196 | |
2197 * doc/conf/meta-data.xml: Moved the system specific configuration into a | |
2198 macro to the top of the configuration document. Call this macro at the | |
2199 end of the user specific part and in the part that should contain the | |
2200 system specific stuff only! | |
2201 | |
2202 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
2203 | |
2204 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
2205 Defined createItem() here and adapted some method signatures, because I | |
2206 need the CallContext deeper in code than expected. | |
2207 | |
2208 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
2209 Write the name of the selected waterlevel into the static DESCRIBE. | |
2210 | |
2211 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
2212 Adapted method signatures that have been changed in DefaultState. | |
2213 | |
2214 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
2215 Removed method createItem() which is now defined in the upper class | |
2216 DefaultState. | |
2217 | |
2218 * src/main/resources/messages.properties, | |
2219 src/main/resources/messages_de_DE.properties, | |
2220 src/main/resources/messages_en.properties, | |
2221 src/main/resources/messages_de.properties: Added string for selected | |
2222 waterlevel that is displayed in static UI. | |
2223 | |
2224 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
2225 | |
2226 * src/main/resources/messages.properties, | |
2227 src/main/resources/messages_de_DE.properties, | |
2228 src/main/resources/messages_en.properties, | |
2229 src/main/resources/messages_de.properties: Added state label for | |
2230 waterlevel selection. | |
2231 | |
2232 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
2233 | |
2234 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
2235 Validate incoming data string and strip brackets. | |
2236 | |
2237 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2238 Fetch waterlevel data from external Artifact if existing. If no external | |
2239 Artifact is specified that provides waterlevel data, we gonna try to | |
2240 fetch it from the current Artifact. | |
2241 | |
2242 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
2243 | |
2244 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
2245 Removed needless import which caused compile errors. | |
2246 | |
2247 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
2248 | |
2249 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
2250 Added a transform() method. This method should be used to transform | |
2251 input data in form of a string into a better data structure. This state | |
2252 provides a simple implementation which just returns a StateData object | |
2253 that contains exactly the input string. | |
2254 | |
2255 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Transform | |
2256 input strings using DefaultState.transform() before they are added to | |
2257 its data pool. | |
2258 | |
2259 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
2260 | |
2261 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
2262 Made collection solid for the case if it has no Artifacts. | |
2263 | |
2264 2011-09-15 Ingo Weinzierl <ingo@intevation.de> | |
2265 | |
2266 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Fetch Artifact | |
2267 from ArtifactDatabase properly. Write better error logs if that process | |
2268 fails. | |
2269 | |
2270 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2271 | |
2272 Extend WDifferences branch to have calculations in dedicated, new state. | |
2273 | |
2274 * doc/conf/artifacts/winfo.xml: Added new State and Transition in | |
2275 WDifferences-branch. | |
2276 | |
2277 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: | |
2278 New state. | |
2279 | |
2280 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2281 Specify to not take input, prepare getting other facets. | |
2282 | |
2283 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
2284 | |
2285 * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: This | |
2286 state now desires the UIProvider 'dem_datacage_panel'. | |
2287 | |
2288 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: | |
2289 New. This state is used to define the desired UIProvider | |
2290 'wsp_datacage_panel'. | |
2291 | |
2292 * doc/conf/artifacts/winfo.xml: Added a new way to start a WSPLGEN | |
2293 calculation when choosing the calculation type 'floodmap'. | |
2294 | |
2295 2011-09-14 Ingo Weinzierl <ingo@intevation.de> | |
2296 | |
2297 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Merge | |
2298 facets only if their name AND their owner artifact are equal. | |
2299 | |
2300 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2301 | |
2302 Partial Fix flys/issue304 (3) (Baseline). | |
2303 | |
2304 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
2305 Show Baseline in WDifferencesPlot. | |
2306 | |
2307 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2308 | |
2309 Fix flys/issue310 (cross-section theme). | |
2310 | |
2311 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
2312 | |
2313 2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2314 | |
2315 Fix flys/issue310 (cross-section theme). | |
2316 | |
2317 * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. | |
2318 | |
2319 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
2320 | |
2321 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2322 Add an quick and simple error to the report if an error occured while | |
2323 WSPLGENJob creation. | |
2324 | |
2325 * src/main/resources/messages.properties, | |
2326 src/main/resources/messages_de_DE.properties, | |
2327 src/main/resources/messages_en.properties, | |
2328 src/main/resources/messages_de.properties: Added error messages for | |
2329 WSPLGEN job creation errors. | |
2330 | |
2331 2011-09-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2332 | |
2333 Fix crash when drawing StickyAxisAnnotation when no range was given. | |
2334 User-directed issues remain ( flys/issue303 ). | |
2335 | |
2336 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java | |
2337 (draw): | |
2338 Guard access to domainAxis, rangeAxis and the corresponding ranges. | |
2339 Warn and exit if any was null. | |
2340 | |
2341 2011-09-13 Ingo Weinzierl <ingo@intevation.de> | |
2342 | |
2343 flys/issue290 (Karte: Eingabe von Differenzen zw. WSP und Gelände findet | |
2344 keine Ausprägung in der Karte) | |
2345 | |
2346 * doc/conf/mapserver/wsplgen_class.vm: Added styles for DIFF attribute. | |
2347 | |
2348 * doc/conf/mapserver/mapfile.vm: Set debug default to '5'. | |
2349 | |
2350 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
2351 | |
2352 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2353 Add a first WSPLGEN status message (notifies the user about a | |
2354 queued job) after the job has been added to the Scheduler. | |
2355 | |
2356 * src/main/resources/messages.properties, | |
2357 src/main/resources/messages_de_DE.properties, | |
2358 src/main/resources/messages_en.properties, | |
2359 src/main/resources/messages_de.properties: Added english and german | |
2360 status message text. | |
2361 | |
2362 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
2363 | |
2364 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Write | |
2365 shapefiles only if there are features for it existing. | |
2366 | |
2367 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2368 A WSPLGEN facet is only created, if the calculation was successfully | |
2369 added to the Scheduler. A barrier facet is only created if the WSPLGEN | |
2370 calculation has been added to the scheduler AND if there are digitized | |
2371 geometries existing. | |
2372 | |
2373 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2374 | |
2375 Copied and slightly modified implementation of guessWaterIncreasing from | |
2376 WQKms to (new) DataUtils. Accidentally commited usage in last commit, to | |
2377 correct orientation of diagram (invert x axis). | |
2378 | |
2379 * src/main/java/de/intevation/flys/utils/DataUtils.java: | |
2380 New file with guessWaterIncreasing implementation from WQKms, | |
2381 slightly adjusted. | |
2382 | |
2383 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2384 | |
2385 Cosmetics. | |
2386 | |
2387 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
2388 src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
2389 Cosmetics. | |
2390 | |
2391 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2392 | |
2393 Added CSV Export for W-Differences. | |
2394 | |
2395 * doc/conf/conf.xml: Added Exporter. | |
2396 | |
2397 * doc/conf/artifacts/winfo.xml: Removed transition over distances | |
2398 state, added export outputmode and facet. | |
2399 | |
2400 * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: | |
2401 New, CSV-Exporter for WDifferences. | |
2402 | |
2403 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2404 Add export facet. | |
2405 | |
2406 2011-09-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2407 | |
2408 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
2409 Cosmetics, docs. | |
2410 | |
2411 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
2412 src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
2413 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
2414 Cosmetics. | |
2415 | |
2416 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
2417 | |
2418 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
2419 Sourced the code to append a concrete data item to the static DESCRIBE | |
2420 part out to an own method (appendStaticData()). | |
2421 | |
2422 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
2423 Override appendStaticData() to suppress the GeoJSON string to be | |
2424 included in the static DESCRIBE. | |
2425 | |
2426 2011-09-12 Ingo Weinzierl <ingo@intevation.de> | |
2427 | |
2428 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
2429 src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2430 src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, | |
2431 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
2432 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
2433 src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, | |
2434 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2435 Removed needless imports. | |
2436 | |
2437 2011-09-09 Ingo Weinzierl <ingo@intevation.de> | |
2438 | |
2439 * src/main/java/de/intevation/flys/artifacts/model/CalculationMessage.java: | |
2440 New. A subclass of Message (in the Artifacts system). It stores a | |
2441 string message and a progress (in form of step x/y). | |
2442 | |
2443 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: The observer | |
2444 now writes background messages into the artifact system using the | |
2445 CallContext.addBackgroundMessage(). We use instances of | |
2446 CalculationMessage here, that makes the WINFOArtifact able to put | |
2447 progress information into the Artifact's DESCRIBE as well. | |
2448 | |
2449 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Write | |
2450 status message and progress information into the DESCRIBE if the | |
2451 Artifact has started a background process. | |
2452 | |
2453 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2454 | |
2455 Fix flys/issue280 . | |
2456 | |
2457 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
2458 Do not draw boxes around annotations. | |
2459 | |
2460 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2461 | |
2462 Fix flys/issue279 . | |
2463 | |
2464 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2465 Fix behaviour in various thinkable malconditions. | |
2466 | |
2467 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2468 | |
2469 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2470 Made one case of cross section fetching more robust. | |
2471 | |
2472 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2473 | |
2474 Fix Facet name and Legend of W-Differences, also insert state to specify | |
2475 distance. | |
2476 | |
2477 * doc/conf/artifacts/winfo.xml: Add additional transitions to walk over | |
2478 distances state. | |
2479 | |
2480 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2481 Set facets description. | |
2482 | |
2483 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
2484 Take facets description as legend. | |
2485 | |
2486 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2487 | |
2488 Added configuration to kick-in w-differences branch of winfo. | |
2489 | |
2490 * doc/conf/conf.xml: Register new (w-differences) OutputGenerators. | |
2491 | |
2492 * doc/conf/artifacts/winfo.xml: Register new state and transitions. | |
2493 | |
2494 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
2495 Added new (w-differences) calculation mode. | |
2496 | |
2497 * src/main/java/de/intevation/flys/exports/WDifferencesCurveInfoGenerator.java: | |
2498 New file, implementing naive approach to display w-differences | |
2499 (accidentially omitted in last commit). | |
2500 | |
2501 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2502 | |
2503 Added very stubby WDifferences State/OutGenerator for WINFOArtifact. | |
2504 | |
2505 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2506 Added w_differences facet type. | |
2507 | |
2508 * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: | |
2509 New file, implements naive approach to calculate w-differences (of | |
2510 calculations identified by hardcoded uuids!) and register respective facet. | |
2511 | |
2512 * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: | |
2513 New file, implementing naive approach to display w-differences. | |
2514 | |
2515 2011-09-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2516 | |
2517 Implement getArtifact(uuid,context) in FLYSUtils. | |
2518 | |
2519 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getArtifact): | |
2520 Added implementation, partially resolving a TODO. Added logger instance. | |
2521 | |
2522 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
2523 | |
2524 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: | |
2525 New. This sublcass of Calculation saves warnings and errors that occur | |
2526 while WSPLGEN is running. | |
2527 Note, that the interface of this class doesn't exactly apply the interface | |
2528 of Calculation. Maybe, we should generalize this interface! | |
2529 | |
2530 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores | |
2531 an instance of WSPLGENCalculation now. We use this instance to save | |
2532 warnings and errors. | |
2533 | |
2534 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Use the | |
2535 WSPLGENCalculation to save errors and warnings. | |
2536 | |
2537 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENReportFacet.java: | |
2538 New. This facet is used for WSPLGEN reports. It stores an instance of | |
2539 WSPLGENCalculation which saves ERRORS and WARNINGS that occur while | |
2540 WSPLGEN execution. | |
2541 | |
2542 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2543 Create a WSPLGENReportFacet for WSPLGEN reports. | |
2544 | |
2545 * doc/conf/conf.xml: Added an OutputGenerator 'report' for WSPLGEN | |
2546 reports. | |
2547 | |
2548 * doc/conf/artifacts/winfo.xml: Added an output 'report' for WSPLGEN | |
2549 reports. | |
2550 | |
2551 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2552 | |
2553 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
2554 src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java, | |
2555 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
2556 Cosmetics, docs. | |
2557 | |
2558 2011-09-08 Ingo Weinzierl <ingo@intevation.de> | |
2559 | |
2560 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: Small | |
2561 adjustments that makes it easier to subclass this observer. | |
2562 | |
2563 * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: New. A | |
2564 sublcass of JobObserver which analyses the WSPLGEN output for errors and | |
2565 warnings. | |
2566 | |
2567 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use | |
2568 JobObserver and ProblemObserver to track the whole WSPLGEN output and | |
2569 print number of errors/warnings to log output. | |
2570 | |
2571 2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2572 | |
2573 Added translation of w_differences. | |
2574 | |
2575 * src/main/resources/messages_de_DE.properties, | |
2576 src/main/resources/messages_de.properties, | |
2577 src/main/resources/messages_en.properties, | |
2578 src/main/resources/messages.properties: | |
2579 Added "w_differnces" translation. | |
2580 | |
2581 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
2582 | |
2583 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
2584 a new attribute 'background-processing' to the DESCRIBE of this | |
2585 Artifact. Its value is 'true' if this Artifact has started a background | |
2586 thread which has not finished yet - otherwise it is 'false. | |
2587 | |
2588 2011-09-07 Ingo Weinzierl <ingo@intevation.de> | |
2589 | |
2590 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
2591 src/main/java/de/intevation/flys/utils/GeometryUtils.java: Moved the | |
2592 code to determine the extent of a river based on its axis to | |
2593 GeometryUtils. | |
2594 | |
2595 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2596 Determine the extent of the selected river and set the WMSLayerFacet's | |
2597 extent attribute. | |
2598 | |
2599 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2600 | |
2601 Added Themeing support for CrossSection Diagrams. | |
2602 | |
2603 * doc/conf/themes.xml: | |
2604 Added new themes and mappings, slightly modified longitudinalsection | |
2605 theme. | |
2606 | |
2607 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2608 | |
2609 In CrossSection Diagram fix subtitle to display the km of which the data is | |
2610 actually displayed (maybe contrasting users wish). | |
2611 | |
2612 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2613 (getCrossSectionSnapKm): New method to fetch the actual km of crosssection. | |
2614 | |
2615 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2616 Add correct km to charts subtitle. | |
2617 | |
2618 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2619 | |
2620 Fix various display-issues like i18n in cross-section diagram. | |
2621 | |
2622 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2623 Set description of facets to expected values. | |
2624 | |
2625 * src/main/java/de/intevation/flys/artifacts/exports/CrossSectionGenerator.java: | |
2626 Fix i18n of chart title. Set subtitle to expected value, pass facets | |
2627 description to StyledSeries to see expected legend. | |
2628 | |
2629 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2630 | |
2631 Cosmetics, resolved refactoring todo. | |
2632 | |
2633 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java | |
2634 (compute, computeAdvance, computeFeed): Refactored, extracted method, | |
2635 resolving duplicate code and TODO. | |
2636 | |
2637 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2638 | |
2639 Fix waterline "calculation" at given km. Chosen approach is | |
2640 "head-through-wall". | |
2641 | |
2642 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2643 Some refactoring to do the same calculation twice easier and be able | |
2644 to "cross" waterline against correct profile data. | |
2645 | |
2646 | |
2647 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2648 | |
2649 Fix setting of kilometer for profile (not yet waterlevel) of cross section | |
2650 diagram. | |
2651 | |
2652 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2653 (getCrossSectionData): Respect corss_section.km data; do naive linear | |
2654 search for profile data for this km. | |
2655 | |
2656 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
2657 Declare a ComputeType. | |
2658 | |
2659 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2660 Implement computeFeed. | |
2661 | |
2662 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2663 | |
2664 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
2665 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2666 Minor cosmetics. | |
2667 | |
2668 2011-09-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2669 | |
2670 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, | |
2671 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2672 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
2673 src/main/java/de/intevation/flys/artifacts/state/DefaultState.java: | |
2674 Cosmetics, docs. | |
2675 | |
2676 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
2677 | |
2678 * doc/conf/mapserver/barrier_polygons_class.vm, | |
2679 doc/conf/mapserver/barrier_lines_class.vm, | |
2680 doc/conf/mapserver/wsplgen_class.vm: Default Mapserver styles for | |
2681 barriers and WSPLGEN results. Those styles are only used as long as we | |
2682 don't have map specific themes (as already used in charts). | |
2683 | |
2684 * doc/conf/mapserver/layer.vm: Implements a fallback mechanism for styling | |
2685 barrier lines/polygons and WSPLGEN results. | |
2686 | |
2687 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added a | |
2688 getStyle() method that currently returns "null". This method needs to be | |
2689 implemented when map themes are introduced. | |
2690 | |
2691 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
2692 | |
2693 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Renamed | |
2694 some attributes to make their job in the mapfile more obvious. | |
2695 | |
2696 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
2697 new facet type for barriers. | |
2698 | |
2699 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: Add | |
2700 a facet for the barriers layer. | |
2701 | |
2702 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Parse | |
2703 barriers (lines and polygons) and create two new layers for each type - | |
2704 those layers are grouped. | |
2705 | |
2706 * doc/conf/mapserver/layer.vm: Renamed attribute based on changes in | |
2707 LayerInfo and added support for Group-Layers. | |
2708 | |
2709 2011-09-06 Raimund Renkert <raimund.renkert@intevation.de> | |
2710 | |
2711 * doc/conf/conf.xml: | |
2712 Added driver to database configuration for use with postgresql. | |
2713 | |
2714 2011-09-06 Ingo Weinzierl <ingo@intevation.de> | |
2715 | |
2716 * doc/conf/mapserver/mapfile.vm: Removed FONTSET attribute and set quotes | |
2717 for SHAPEPATH. | |
2718 | |
2719 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
2720 | |
2721 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
2722 Removed. We gonna use the WMSLayerFacet until now. | |
2723 | |
2724 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2725 Add a WMSLayerFacet after we triggered the Scheduler to start a WSPLGEN | |
2726 calculation. | |
2727 | |
2728 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
2729 | |
2730 * doc/conf/mapserver/layer.vm, | |
2731 doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements. | |
2732 | |
2733 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the | |
2734 MapfileGenerator after a WSPLGEN job has finished regardless if it has | |
2735 been finished successfully or not. | |
2736 | |
2737 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
2738 | |
2739 * pom.xml: Added Apache Velocity 1.7 for templating support. | |
2740 | |
2741 * doc/conf/conf.xml: Added config options for mapserver/template relevant | |
2742 stuff. | |
2743 | |
2744 * doc/conf/mapserver/mapfile.vm, | |
2745 doc/conf/mapserver/layer.vm: New. A default mapfile template and a | |
2746 template used for layers. | |
2747 | |
2748 * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: New. | |
2749 This class is used while reading WMS layer relevant information from | |
2750 filesystem. | |
2751 | |
2752 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: New. This | |
2753 thread is used for creating mapfiles for Mapserver. The MapfileGenerator | |
2754 runs in daemon mode (own thread) and creates mapfiles based on WMS | |
2755 layer relevant information read from filesystem. | |
2756 | |
2757 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
2758 src/main/java/de/intevation/flys/utils/FLYSUtils.java: Moved shapefile | |
2759 specific XPath expressions from FloodMapState to FLYSUtils which is a | |
2760 better place to use it in other classes (as MapfileGenerator). | |
2761 | |
2762 2011-09-05 Ingo Weinzierl <ingo@intevation.de> | |
2763 | |
2764 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: | |
2765 Bugfixed broken attribute assignment. | |
2766 | |
2767 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Call | |
2768 CallContext.afterBackground() after a WSPLGEN job has finished to remove | |
2769 the background lock from Artifact. | |
2770 | |
2771 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2772 Call CallContext.afterCall(BACKGROUND) to lock the Artifact for | |
2773 background processing. | |
2774 | |
2775 2011-09-02 Ingo Weinzierl <ingo@intevation.de> | |
2776 | |
2777 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: New. This | |
2778 class is used to start WSPLGEN for a specific WSPLGENJob. The System | |
2779 property "wsplgen.bin.path" tells the JobExecutor where the WSPLGEN | |
2780 binary is placed (which means in general, the property points to the | |
2781 'wsplgen.exe'). | |
2782 | |
2783 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: New. This | |
2784 scheduler currently allows to start just a single WSPLGEN Thread. All | |
2785 WSPLGEN calculations should be started using Scheduler.addJob(). | |
2786 | |
2787 * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: New. This | |
2788 thread reads log messages from WSPLGEN and listens for specific | |
2789 messages. It should be used to update status messages of the WSPLGEN | |
2790 calculation that is currently running. | |
2791 There is a System property that tells the JobObserver to log all WSPLGEN | |
2792 output to log4j: enable WSPLGEN output with "-Dwsplgen.log.output=true". | |
2793 | |
2794 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Added | |
2795 the FLYSArtifact, the current working directory and the CallContext. | |
2796 | |
2797 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2798 Use the Scheduler to start new WSPLGEN calculations. | |
2799 | |
2800 2011-09-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2801 | |
2802 Add CrossSectionInfoGenerator. | |
2803 | |
2804 * src/main/java/de/intevation/flys/exports/CrossSectionInfoGenerator.java: | |
2805 New, trivial implementation of CrossSectionInfoGenerator. | |
2806 | |
2807 * doc/conf/conf.xml: | |
2808 Register CrossSectionInfoGenerator. | |
2809 | |
2810 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2811 | |
2812 Cleanups of CrossSection*. | |
2813 | |
2814 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2815 New methods to retrieve name of utilized CrossSection. | |
2816 | |
2817 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2818 Cleanup, get rid of copied unused method, documentation and more sensible | |
2819 translations. | |
2820 | |
2821 * src/main/resources/messages_de_DE.properties, | |
2822 src/main/resources/messages_de.properties, | |
2823 src/main/resources/messages_en.properties, | |
2824 src/main/resources/messages.properties: | |
2825 Added cross_section* translations, also cleanups. | |
2826 | |
2827 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
2828 | |
2829 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2830 Set the "typ" attribute of lines and polygons in barrier shapefiles. | |
2831 | |
2832 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
2833 | |
2834 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2835 Set the Z values of line and polygon barrier geometries. Both barrier | |
2836 shapefiles will contain 3D geometries now. | |
2837 | |
2838 2011-09-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2839 | |
2840 Get real data to display in CrossSection (although ignorant of | |
2841 parameterization), making use of the showcase code of the CrossSectionApp- | |
2842 Standalone application. | |
2843 | |
2844 * doc/conf/artifacts/winfo.xml: Add new facet (~waterline) to state/out. | |
2845 | |
2846 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2847 New methods to get relevant data. So far just takes the first value of | |
2848 everything and assuming a waterlevel at 130m. | |
2849 | |
2850 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: | |
2851 New Facet responsible of water level in cross section. | |
2852 | |
2853 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
2854 Made some functionality publicly and statically available. | |
2855 | |
2856 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
2857 Update call. | |
2858 | |
2859 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added new | |
2860 Facet type. | |
2861 | |
2862 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2863 Added new Facet to out. | |
2864 | |
2865 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2866 Respect new facet and facets data. | |
2867 | |
2868 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
2869 | |
2870 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Close an open | |
2871 shapefile transaction and catch exceptions which are thrown while | |
2872 shapefile creation here. If there occured an error, this functions | |
2873 returns FALSE, otherwise TRUE. | |
2874 | |
2875 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2876 Removed exception handling while shapefile creation - this is done in | |
2877 GeometryUtils now. | |
2878 | |
2879 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
2880 | |
2881 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2882 Renamed the file for WSPLGEN required waterlevels to "waterlevels.wst". | |
2883 WSPLGEN did not work with the former "waterlevels.txt" file. | |
2884 | |
2885 2011-09-01 Ingo Weinzierl <ingo@intevation.de> | |
2886 | |
2887 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New static | |
2888 function that builds new SimpleFeatureTypes with additional attributes. | |
2889 | |
2890 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2891 Write attributes "ELEVATION" and "KILOMETER" into the crosssection | |
2892 tracks shapefiles. | |
2893 | |
2894 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
2895 | |
2896 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method | |
2897 stub that should return a FLYSArtifact based on a given UUID. | |
2898 | |
2899 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
2900 Write the selected WST file for WSPLGEN. Note, that this is the WST file | |
2901 of the current WINFO artifact. Furthermore, there is currently no way | |
2902 for the user to select a column from WST file, so we currently use the | |
2903 column that is written to WST file at first. | |
2904 | |
2905 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
2906 | |
2907 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
2908 the parameter order of a compute(...) method. This makes me able to call | |
2909 this without a hash value. | |
2910 | |
2911 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
2912 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
2913 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
2914 Adapted the parameter order of the compute() call (see above). | |
2915 | |
2916 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2917 | |
2918 More bones to CrossSection sceleton. | |
2919 | |
2920 * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, | |
2921 src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: | |
2922 New, yet trivial implementations of Factory and Facet for CrossSections. | |
2923 | |
2924 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2925 Add new CrossSection- (instead of Default-)Facet. | |
2926 | |
2927 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
2928 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2929 Adjusted to use (touch) new Factory and Facet. | |
2930 | |
2931 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2932 | |
2933 Cosmetics. | |
2934 | |
2935 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
2936 Cosmetics. | |
2937 | |
2938 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2939 | |
2940 Cosmetics. | |
2941 | |
2942 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
2943 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
2944 src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
2945 src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2946 Removed obselete imports. | |
2947 | |
2948 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
2949 Removed obselete imports, whitespaces. | |
2950 | |
2951 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
2952 Whitespaces, docs. | |
2953 | |
2954 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2955 | |
2956 Fix translations of Main Values Facets. | |
2957 | |
2958 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
2959 Do acrobatics to keep state transient but get translated title. | |
2960 | |
2961 * src/main/java/de/intevation/flys/artifacts/MainValuesQFacet.java, | |
2962 src/main/java/de/intevation/flys/artifacts/MainValuesWFacet.java: | |
2963 Changed constructor to get description (which is then already be translated) | |
2964 dynamically, adjust deepCopy. | |
2965 | |
2966 * src/main/java/de/intevation/flys/states/StaticState.java: | |
2967 Adjust constructor accordingly. | |
2968 | |
2969 2011-08-31 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2970 | |
2971 Add sceleton for CrossSection outs. | |
2972 | |
2973 * doc/conf/artifacts/winfo.xml: | |
2974 Added new output mode to respective state of winfo artifact configuration. | |
2975 | |
2976 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
2977 Add new Dummy-Facet in state. | |
2978 | |
2979 * doc/conf/conf.xml: | |
2980 Registered new OutputGenerator. | |
2981 | |
2982 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
2983 Added new CROSS_SECTION type. | |
2984 | |
2985 * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: | |
2986 New, stubby skeleton for an CrossSectionGenerator. | |
2987 | |
2988 * src/main/resources/messages_de_DE.properties, | |
2989 src/main/resources/messages_de.properties, | |
2990 src/main/resources/messages_en.properties, | |
2991 src/main/resources/messages.properties: | |
2992 Added cross_section translation, also cleanups (e.g. main values). | |
2993 | |
2994 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
2995 | |
2996 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Marked | |
2997 required parameters with a comment. | |
2998 | |
2999 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3000 Export floodplains (german 'Talaue') to shapefile and write its file | |
3001 path into the WSPLGEN job. | |
3002 | |
3003 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
3004 | |
3005 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3006 Search for a DGM that fits to the current river and km range and write | |
3007 its file path into the WSPLGEN job. | |
3008 | |
3009 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
3010 | |
3011 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Improved | |
3012 exception handling: exceptions are catched in GeometryUtils now. | |
3013 | |
3014 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3015 Write river axis and crosssections to shapefiles and save shapefile | |
3016 pathes in WSPLGENJob. | |
3017 | |
3018 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
3019 | |
3020 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3021 Use the coorect SRID for reading GeoJSON and writing line/polygon | |
3022 shapefiles. | |
3023 | |
3024 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Use a | |
3025 concrete coordinate system while feature type creation. | |
3026 | |
3027 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
3028 | |
3029 * pom.xml: Added GeoTools 2.7.2 dependencies for Shapefile, GeoJSON and | |
3030 EPSG support. | |
3031 | |
3032 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Store | |
3033 'LIN' parameter in a list now. A WSPLGEN parameter might contain many | |
3034 LINs. | |
3035 | |
3036 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New functions | |
3037 to create FeatureTypes and to write shapefiles. | |
3038 | |
3039 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3040 Write user specified barriers into a shapefile placed in the artifact | |
3041 directory. | |
3042 | |
3043 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
3044 | |
3045 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function | |
3046 that extracts the SRID defined in the global configuration file for a | |
3047 given river. | |
3048 | |
3049 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
3050 Removed the code that extracts the river SRID - use FLYSUtils instead. | |
3051 | |
3052 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3053 | |
3054 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
3055 | |
3056 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
3057 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
3058 | |
3059 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3060 | |
3061 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
3062 | |
3063 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
3064 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
3065 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
3066 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
3067 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
3068 Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. | |
3069 | |
3070 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3071 | |
3072 Commit accidentally omitted result of refactoring (WINFO/FLYSUtils/getRiver). | |
3073 | |
3074 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
3075 Removed implementations of getRiver, update calls to use FLYSUtils. | |
3076 | |
3077 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3078 | |
3079 Interpolate Q main values, generate interpolated W main values on the fly from | |
3080 Q main values. | |
3081 | |
3082 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3083 (getGaugeDatum): removed, obsolete | |
3084 (getLocation): new, gets location | |
3085 Use WstValueTable to look up interpolated Qs of MainValues. In absence of | |
3086 the same functionality for Ws, generate W Main Values from Q Main Values. | |
3087 | |
3088 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3089 | |
3090 Use new helper class FLYSUtils, minor refactorization. | |
3091 | |
3092 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3093 Use new functionality of helper class, convenience of FLYSArtifact. | |
3094 | |
3095 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3096 | |
3097 Refactored to use new Helper class FLYSUtils, moved getRiver-functionality | |
3098 in there. | |
3099 | |
3100 * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getRiver): | |
3101 New function to retrieve river of an artifact, slightly modified from | |
3102 WINFOArtifact. | |
3103 | |
3104 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
3105 Removed implementations of getRiver, update calls to use FLYSUtils. | |
3106 | |
3107 2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3108 | |
3109 Minor cosmetics. | |
3110 | |
3111 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3112 Resolved a TODO. | |
3113 | |
3114 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
3115 Added some documentation. | |
3116 | |
3117 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
3118 Minor cosmetic. | |
3119 | |
3120 2011-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3121 | |
3122 * doc/conf/meta-data.xml: Made it Oracle compatible. | |
3123 | |
3124 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
3125 If running in debug mode log executed statements. | |
3126 Helps debugging Oracle connections. | |
3127 | |
3128 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3129 | |
3130 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3131 Set some WSPLGENJob parameters which are stored at FLYSArtifact. | |
3132 | |
3133 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3134 | |
3135 * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New. This helper | |
3136 class should provide some basic FLYS stuff. Currently, there are functions | |
3137 that return the km range/location. | |
3138 | |
3139 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
3140 the methods that return the km range/locations. This is implemented in | |
3141 FLYSUtils now. | |
3142 | |
3143 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
3144 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
3145 src/main/java/de/intevation/flys/exports/ChartGenerator.java: Adapted | |
3146 the WINFO method calls to retrieve the km range/locations - call | |
3147 FLYSUtils now. | |
3148 | |
3149 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3150 | |
3151 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New method | |
3152 to destroy a single state. | |
3153 | |
3154 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3155 | |
3156 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3157 Cosmetic, remove debug output and comments, minor style adjustments. | |
3158 | |
3159 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3160 | |
3161 Added limited themeing-support for MainValues. | |
3162 | |
3163 * doc/conf/themes.xml: | |
3164 Added Q/W-MainValues themes. | |
3165 | |
3166 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3167 Added limited theming support, add legend entry for main values. | |
3168 | |
3169 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3170 | |
3171 * doc/conf/conf.xml: Added a configuration node that points to the directory | |
3172 where shapefiles should be stored in. | |
3173 | |
3174 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: New. | |
3175 This class is used to save/write the parameter for a WSPLGEN calculation. | |
3176 WSPLGEN's *.par files are written using the toFile() method. | |
3177 | |
3178 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3179 A directory for all WSPLGEN stuff is created in computeAdvance() - those | |
3180 directory and all its contained files are removed in endOfLife(). | |
3181 | |
3182 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3183 | |
3184 * src/main/java/de/intevation/flys/utils/ThemeUtil.java: | |
3185 New Util to work with theme-related stuff. | |
3186 | |
3187 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3188 | |
3189 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3190 Use NamedDoubles instead of MainValues, try to adjust scale of Ws. | |
3191 | |
3192 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3193 Use NamedDoubles instead of MainValues, generalize annotation handling, to | |
3194 allow easier reusability and themeing. | |
3195 | |
3196 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
3197 Added convenience constructor, exemplary switch on bordered text. | |
3198 | |
3199 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3200 | |
3201 * doc/conf/meta-data.xml: | |
3202 Recommend MainValues for Computed discharge curves. | |
3203 | |
3204 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3205 | |
3206 New NamedDouble class which implements a <String,double>-pair. | |
3207 | |
3208 * src/main/java/de/intevation/flys/artifacts/model/NamedDouble.java: | |
3209 New, implementation of a double with a string or vice versa. | |
3210 | |
3211 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3212 | |
3213 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
3214 State.endOfLife() for all States when endOfLife() of the Artifact is | |
3215 called. | |
3216 | |
3217 2011-08-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3218 | |
3219 Also plot "W"-MainValues (on vertical axis), take correct parameters, but | |
3220 do not convert to correct scale (cm vs NN+m). | |
3221 | |
3222 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
3223 Naive attempt at allowing the vertical axis to be sticked at. | |
3224 | |
3225 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3226 Store Q and W MainValues separately, add them to plot as annotations. | |
3227 | |
3228 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3229 Serve the MainValues, parameterized on river and location, Q and W. | |
3230 Removed Facet-implementation. | |
3231 | |
3232 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3233 Updated Facet Types. | |
3234 | |
3235 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: | |
3236 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
3237 New, trivial facets, extracted from MainValuesArtifact. | |
3238 | |
3239 2011-08-26 Ingo Weinzierl <ingo@intevation.de> | |
3240 | |
3241 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
3242 State.endOfLife() of each State that is no longer in the queue of the | |
3243 artifact when this artifact steps back to a previous state. | |
3244 | |
3245 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3246 | |
3247 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3248 Plot MainValues delivered by MainValuesFacet in much the same ways than | |
3249 Annotations in LongitudinalSection plots. | |
3250 | |
3251 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3252 | |
3253 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
3254 Prepare further differentiation between Annotations that stick to X or Y- | |
3255 Axis, copied some positioning logic into StickyAxisAnnotation | |
3256 implementation. | |
3257 | |
3258 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3259 | |
3260 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
3261 Minor cosmetics. | |
3262 | |
3263 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3264 | |
3265 Added MainValue-Fetching-Capabilities to MainValuesArtifact. | |
3266 | |
3267 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
3268 (initialize, getMinValues): | |
3269 Let MainValuesArtifact return "real" MainValues, although ignorant of all | |
3270 parameterization. | |
3271 | |
3272 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3273 | |
3274 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
3275 (MainValueFacet): | |
3276 Improved and straightened implementation, added code-Annotations and Todos. | |
3277 | |
3278 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3279 | |
3280 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
3281 (MainValueFacet): | |
3282 Improved and straightened implementation, added code-Annotations and Todos. | |
3283 | |
3284 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3285 | |
3286 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java | |
3287 (getState): | |
3288 Resolved multiple creation of state (yet not very clean). | |
3289 | |
3290 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3291 | |
3292 * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
3293 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3294 Cosmetics, docs. | |
3295 | |
3296 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
3297 Cosmetics. | |
3298 | |
3299 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3300 | |
3301 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
3302 Added new (MainValues) Facet-Type. | |
3303 | |
3304 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
3305 | |
3306 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
3307 Added a method that returns a River object based on its database id. | |
3308 | |
3309 * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: The | |
3310 data that is required for this artifact is fetched from database instead | |
3311 from a Master-Artifact. The creation of static artifacts should use | |
3312 database ids instead of cloning a Master-Artifact. | |
3313 | |
3314 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
3315 | |
3316 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3317 Removed needless imports. | |
3318 | |
3319 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3320 | |
3321 Added configuration for factory and rule for MainValueArtifacts. | |
3322 | |
3323 * doc/conf.xml: | |
3324 Add a mainvalue factory to serve MainValueArtifacts. | |
3325 | |
3326 * doc/conf/meta-data.xml: | |
3327 Recomment mainvalue artifact when computed_discharge_curve can be put out. | |
3328 | |
3329 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3330 | |
3331 Let MainValuesArtifact have a state, outputmode and facet. | |
3332 | |
3333 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | |
3334 New, a non-abstract DefaultState. | |
3335 | |
3336 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3337 Progressed with implementation, use StaticState to hook output modes and | |
3338 facet in; use (Static)FLYSArtifact implementation. | |
3339 | |
3340 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3341 | |
3342 Smaller cosmetics. | |
3343 | |
3344 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
3345 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
3346 Cosmetics in comments. | |
3347 | |
3348 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
3349 Added @Override annotations. | |
3350 | |
3351 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
3352 Use brackets to improve readability of ternary operator. | |
3353 | |
3354 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3355 | |
3356 * doc/conf/meta-data.xml: Use "ids" in user specific part, too. | |
3357 | |
3358 2011-08-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3359 | |
3360 * doc/conf/meta-data.xml: s/db-ids/ids/g to unify system and user specific | |
3361 loading. | |
3362 | |
3363 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3364 | |
3365 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3366 Extracted access to state and states in order to have fewer places to | |
3367 modify when going for single/trivial state- artifacts. | |
3368 | |
3369 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
3370 | |
3371 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
3372 Append the river's srid to the WMSLayerFacet. | |
3373 | |
3374 2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3375 | |
3376 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3377 Minor fixes, ressurect Facet implementation as inner class. | |
3378 | |
3379 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
3380 | |
3381 * doc/conf/artifacts/winfo.xml: Moved the input of barriers one state | |
3382 earlier where the scenario is selected as well. | |
3383 | |
3384 * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: | |
3385 This state now desires the "map_digitize" UI provider and returns both | |
3386 items "scenario" and "uesk.barriers" in the dynamic describe part. | |
3387 | |
3388 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3389 Removed the UI provider and the computeFeed() which is no longer needed, | |
3390 because there is no more user input in this state. | |
3391 | |
3392 2011-08-24 Ingo Weinzierl <ingo@intevation.de> | |
3393 | |
3394 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
3395 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
3396 Repaired broken xpath expressions (the config changed in one of the last | |
3397 commits) and make use of the variable support in xpath expressions to | |
3398 replace the rivername. | |
3399 | |
3400 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
3401 Save the rivername while initializing this artifact. This is now | |
3402 necessary, because each river can have its own background wms | |
3403 configured. | |
3404 | |
3405 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
3406 | |
3407 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
3408 Repaired broken river-wms initialization. | |
3409 | |
3410 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3411 | |
3412 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java, | |
3413 src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, | |
3414 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
3415 src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java, | |
3416 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
3417 src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, | |
3418 src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, | |
3419 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
3420 src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
3421 Made facets cloneable with the right type. | |
3422 | |
3423 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, | |
3424 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3425 Removed superfluous imports. | |
3426 | |
3427 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
3428 | |
3429 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3430 Declare the first artifact of an output as master artifact (artifacts | |
3431 are ordered by their creation time). | |
3432 | |
3433 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3434 | |
3435 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3436 Removed facet interface. | |
3437 | |
3438 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3439 Make artifacts cloneable. TODO: Override deepCopy() in subclassed | |
3440 states and facets. | |
3441 | |
3442 2011-08-23 Ingo Weinzierl <ingo@intevation.de> | |
3443 | |
3444 * doc/conf/conf.xml: Added the MapInfoService and adapted the floodmap | |
3445 configuration. Now, each river can have its own background wms layer | |
3446 defined. | |
3447 | |
3448 * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: | |
3449 New. This service returns some basic information used to create maps for | |
3450 a specific river. The name of the desired river needs to be defined at | |
3451 "/mapinfo/river/text()". | |
3452 | |
3453 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
3454 Adapted an xpath expression that points to the srid of a river in the | |
3455 floodmap configuration (which changed). | |
3456 | |
3457 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3458 | |
3459 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3460 Build out/facet filter from XML document passed at creation time. | |
3461 | |
3462 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3463 | |
3464 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3465 Added some code to filter outs/facets by an optional positive list. | |
3466 This is needed to only expose parts of the facets. This | |
3467 is needed for artifacts which are loaded into a collection. | |
3468 TODO: create the filter from the XML document passed at creation | |
3469 time. | |
3470 | |
3471 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3472 | |
3473 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved all | |
3474 WINFO specific code to WINFOArtifact. FLYSArtifact is now only revolving | |
3475 about state affairs. | |
3476 | |
3477 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-inserted | |
3478 the specific stuff here. | |
3479 | |
3480 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
3481 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
3482 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
3483 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
3484 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
3485 src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
3486 Adjusted the casts. | |
3487 | |
3488 2011-08-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3489 | |
3490 * doc/conf/meta-data.xml: Filter by outs in user template part. | |
3491 | |
3492 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
3493 | |
3494 * doc/conf/artifacts/winfo.xml: Defined an input value for the GeoJSON | |
3495 string to save user defined barriers in the map. | |
3496 | |
3497 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
3498 Added a computeFeed() method. In addition, this state now prefers the | |
3499 "noinput" UI provider. | |
3500 | |
3501 2011-08-19 Ingo Weinzierl <ingo@intevation.de> | |
3502 | |
3503 * doc/conf/conf.xml: Each river requires a SRID definition. This | |
3504 definition is used to transform the river's geometries into the desired | |
3505 projection. | |
3506 | |
3507 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
3508 This facets are able to save a SRID. | |
3509 | |
3510 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
3511 The extent that is written into the WMSLayerFacet is determined by the | |
3512 boundary of the geometry. | |
3513 | |
3514 * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New. A | |
3515 utility class that provides helper functions for geometries. Currently, | |
3516 one function is defined, that creates a boundary string for OpenLayers. | |
3517 | |
3518 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3519 | |
3520 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
3521 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
3522 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
3523 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
3524 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
3525 src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
3526 Removed superfluous imports. | |
3527 | |
3528 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3529 | |
3530 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
3531 Removed CallContext from state validation. It is not needed and hindered | |
3532 the extraction of all out of an artifact if you don't have a | |
3533 call context (like initial scan of datacage database). | |
3534 | |
3535 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3536 Extract all outs now. | |
3537 | |
3538 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
3539 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
3540 src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, | |
3541 src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
3542 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
3543 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
3544 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
3545 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
3546 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
3547 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
3548 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
3549 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
3550 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
3551 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
3552 src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
3553 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, | |
3554 src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
3555 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
3556 Adjusted calls. | |
3557 | |
3558 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3559 | |
3560 * src/main/resources/messages.properties, | |
3561 src/main/resources/messages_de_DE.properties, | |
3562 src/main/resources/messages_en.properties, | |
3563 src/main/resources/messages_de.properties: | |
3564 Added lacalization of "Streckenfavoriten". | |
3565 | |
3566 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3567 | |
3568 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
3569 Picky white-space cosmetics. | |
3570 | |
3571 2011-08-19 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3572 | |
3573 Added stub implementation of new MainValuesArtifact. | |
3574 | |
3575 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
3576 New. Stub implementation for new MainValuesArtifact. | |
3577 | |
3578 2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3579 | |
3580 Fixed flys/issue262 | |
3581 | |
3582 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
3583 Unified user and system tempate. | |
3584 Looks for "/artifact-database/metadata/template/text()" | |
3585 in conf.xml. Defaults to "${artifacts.config.dir}/meta-data.xml". If user id is | |
3586 given its the default connection for contexts. | |
3587 | |
3588 * doc/conf/conf.xml: Adjusted | |
3589 * doc/conf/meta-data-system.xml, doc/conf/meta-data-user.xml: Deleted. | |
3590 * doc/conf/meta-data.xml: Unified version of user and system template. | |
3591 | |
3592 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
3593 Adjusted the test program. | |
3594 | |
3595 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3596 | |
3597 Fixed flys/issue260 | |
3598 | |
3599 * doc/conf/meta-data-user.xml: Uses master_artifacts view now. | |
3600 | |
3601 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3602 | |
3603 * doc/conf/datacage.sql: Added view master_artifacts to select | |
3604 the master artifacts of the collections more easily. | |
3605 To upgrade existing database: | |
3606 | |
3607 CREATE VIEW master_artifacts AS | |
3608 SELECT a2.id AS id, | |
3609 a2.gid AS gid, | |
3610 a2.state AS state, | |
3611 a2.creation AS creation, | |
3612 ci2.collection_id AS collection_id | |
3613 FROM collection_items ci2 | |
3614 JOIN artifacts a2 | |
3615 ON ci2.artifact_id = a2.id | |
3616 JOIN (SELECT ci.collection_id AS c_id, | |
3617 MIN(a.creation) AS oldest_a | |
3618 FROM collection_items ci | |
3619 JOIN artifacts a | |
3620 ON ci.artifact_id = a.id | |
3621 GROUP BY ci.collection_id) o | |
3622 ON o.c_id = ci2.collection_id | |
3623 WHERE a2.creation = o.oldest_a; | |
3624 | |
3625 TODO: Use the view in the templates. | |
3626 | |
3627 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3628 | |
3629 * doc/conf/meta-data-user.xml: Removed state filter because it was broken. | |
3630 Simplified by joining two contexts. | |
3631 | |
3632 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3633 | |
3634 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
3635 Fix issues with lines of annotation when zoomed (wrong scale used). | |
3636 | |
3637 2011-08-18 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3638 | |
3639 Added legend for annotations to LongitudinalSectionDiagram. | |
3640 | |
3641 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3642 Added a pseudo-dataseries/collection to employ existing infrastructure for | |
3643 displaying localized label for Annotations (yet unthemed). | |
3644 | |
3645 * src/main/resources/messages.properties, | |
3646 src/main/resources/messages_de_DE.properties, | |
3647 src/main/resources/messages_en.properties, | |
3648 src/main/resources/messages_de.properties: | |
3649 Made label-string available for localization. | |
3650 | |
3651 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3652 | |
3653 Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . | |
3654 | |
3655 * src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
3656 Deleted/moved to src/main/java/de/intevation/flys/jfree/ . | |
3657 | |
3658 * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: | |
3659 New/moved from src/main/java/de/intevation/flys/export/ , adjusted | |
3660 package statement, made class public. | |
3661 | |
3662 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3663 Added import statement for de.intevation.flys.jfree.StickyAxisAnnotation . | |
3664 | |
3665 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3666 | |
3667 Extracted and renamed CustomAnnotation to StickyAxisAnnotation. Also removed | |
3668 needless imports. | |
3669 | |
3670 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
3671 src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: | |
3672 Extracted class implementation CustomAnnotation and renamed to | |
3673 StickyAxisAnnotation. | |
3674 | |
3675 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3676 | |
3677 Improved CustomAnnotations and rendering thereof, now including an | |
3678 "axis mark" (little line at axis), also prepared possibility to put | |
3679 annotations on Y-axis. | |
3680 | |
3681 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3682 Improved CustomAnnotation to include marks on the axis and better spacing | |
3683 from it. | |
3684 | |
3685 2011-08-17 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3686 | |
3687 Implemented proof-of-concept collision-detection when drawing | |
3688 CustomAnnotations (text only). | |
3689 | |
3690 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
3691 Pass a fresh ChartRenderingInfo-Object to createBufferedImage, such that | |
3692 information can be collected while rendering. | |
3693 | |
3694 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3695 Exploit the fact that XYTextAnnotation already registers drawn shape in the | |
3696 ChartRenderingInfo if it exists and either an URL or tooltip is set. | |
3697 Before drawing, calculate own shape and compare against already registered | |
3698 shapes. | |
3699 | |
3700 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3701 | |
3702 Implemented (yet dummy) custom Annotation class. | |
3703 | |
3704 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3705 Added implementation of yet dummy CustomAnnotation class. | |
3706 | |
3707 2011-08-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3708 | |
3709 Slightly improved rendering of annotations. | |
3710 | |
3711 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3712 Slightly improved rendering of annotations. Still no valid collision | |
3713 detection. Annotations are drawn every 2 km; first come first serve. | |
3714 | |
3715 2011-08-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3716 | |
3717 Fix for flys/issue191 | |
3718 | |
3719 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(longestIncreasingWRangeIndices): | |
3720 Added a method to find the longest index range with increasing w values. | |
3721 | |
3722 * src/main/java/de/intevation/flys/exports/ATWriter.java: Export the longest | |
3723 range of monotone increasing w values instead of the first one. | |
3724 TODO: The first line of the export is still broken. | |
3725 | |
3726 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
3727 Removed superfluous import. | |
3728 | |
3729 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3730 | |
3731 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: | |
3732 Resolved two TODOs: get Annotations of selected River, get "point" | |
3733 Annotations only. | |
3734 | |
3735 2011-08-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3736 | |
3737 Added functionality to query range and point-annotations only to | |
3738 AnnotationFactory. | |
3739 | |
3740 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java | |
3741 (getPointAnnotations, getAnnotationsBreadth): | |
3742 New functions to query breadth and point-only annotations. | |
3743 | |
3744 2011-08-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3745 | |
3746 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
3747 Added a development mode for recommendations. Enabled with | |
3748 stetting system property 'flys.datacage.recommendations.development' to true. | |
3749 When set the XML template are re-read if the timestamps of the | |
3750 files have changed so you do not have to restart the server again and again. | |
3751 | |
3752 * doc/conf/meta-data-user.xml: Sort collections by creation time in descending order. | |
3753 | |
3754 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3755 | |
3756 Rather picky cosmetics only. | |
3757 | |
3758 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
3759 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
3760 src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, | |
3761 src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java, | |
3762 src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
3763 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
3764 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
3765 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3766 End comments on a full stop, separate from closing '*/' by whitespace, | |
3767 adjusted javadoc comments. | |
3768 | |
3769 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3770 | |
3771 Made Annotations visible in LongitudinalSection diagrams. | |
3772 | |
3773 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, | |
3774 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
3775 Register new Facet Type, let LongitudinalSectionGenerator include | |
3776 Annotations in diagram (yet unfiltered and independent of river). | |
3777 | |
3778 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3779 | |
3780 * doc/conf/conf.xml, | |
3781 doc/conf/artifacts/annotation.xml, | |
3782 doc/conf/meta-data-system.xml: | |
3783 Added configuration for AnnotationArtifacts. | |
3784 | |
3785 2011-08-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3786 | |
3787 Added demo- implementation of a AnnotationArtifact and its Facet. | |
3788 | |
3789 * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | |
3790 src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | |
3791 src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: | |
3792 New. Initial version of an AnnotationArtifact and its State and Facet. | |
3793 | |
3794 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3795 | |
3796 * doc/conf/datacage.sql: Extended schema for artifacts and collections | |
3797 to have creation times, too. | |
3798 | |
3799 To update existing databases: | |
3800 | |
3801 ALTER TABLE artifacts ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
3802 ALTER TABLE collections ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; | |
3803 | |
3804 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3805 Store creation times for artifacts and collections, too. | |
3806 | |
3807 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
3808 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
3809 Adjusted SQL statements. | |
3810 | |
3811 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3812 | |
3813 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3814 Make it compilable again (BackendListener interface changed). | |
3815 | |
3816 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3817 | |
3818 * doc/conf/meta-data-user.xml: Added grouping element around w/q of each | |
3819 longitudinal section artifact. | |
3820 | |
3821 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java, | |
3822 src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java: | |
3823 Added some debugging capabilities. | |
3824 | |
3825 * src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: | |
3826 Added isEmpty() method. | |
3827 | |
3828 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
3829 Now it is possible to nest <dc:elements> into other elements in the <dc:context> | |
3830 body. This is useful and needed for grouping and repeating results. | |
3831 | |
3832 2011-08-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3833 | |
3834 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
3835 User connection was cached, system was not. Lead to incorrect results. | |
3836 | |
3837 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3838 | |
3839 * doc/conf/meta-data-user.xml: Added <old_calculations> element | |
3840 around old calculations. | |
3841 | |
3842 2011-08-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3843 | |
3844 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
3845 Cosmetic: Replaced usage of legacy java.util.Stack with java.util.Deque. | |
3846 | |
3847 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3848 | |
3849 * doc/conf/meta-data-user.xml: Use 'CAST(x AS uuid)' instead of 'x::uuid' | |
3850 to be more compatible. | |
3851 | |
3852 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3853 | |
3854 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
3855 If given an artifact place its identifier into parameters passed to template. | |
3856 Fixed swapped user/system connections if using the user template. | |
3857 | |
3858 * doc/conf/meta-data-user.xml: Recommend w/q facet from old calculations | |
3859 if an artifact was given that represents a longitudinal section | |
3860 "Laengsschnitt". | |
3861 | |
3862 TODO I: The template uses PostgreSQL specific UUID casts. | |
3863 TODO II: We need to find a way only to recommend the master artifacts. | |
3864 | |
3865 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3866 | |
3867 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
3868 Added a <dc:comment> tag to place comments in the meta data templates. | |
3869 <!-- ... --> comments are copied through. | |
3870 | |
3871 * doc/conf/meta-data-user.xml: Added a simple test. | |
3872 | |
3873 2011-08-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3874 | |
3875 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
3876 Be a bit more tolerant about empty strings for UUIDs of artifact and user. | |
3877 | |
3878 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3879 | |
3880 Bring user specific meta data service to life. | |
3881 | |
3882 * doc/conf/conf.xml: There are now two templates to configure: | |
3883 The system template (only the data from the backend) and the | |
3884 user template (the datcage db and the backend db), | |
3885 | |
3886 * doc/conf/meta-data-template.xml: Deleted. | |
3887 * doc/conf/meta-data-user.xml: New. The user specific template. TODO: Write it! | |
3888 * doc/conf/meta-data-system.xml: New. The system template. | |
3889 | |
3890 * src/main/java/de/intevation/flys/artifacts/datacage/templating/NoneUserSpecific.java: | |
3891 Deleted. | |
3892 * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: | |
3893 New. The logic to fill the templates. | |
3894 | |
3895 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
3896 Adjusted to follow the new call signatures. | |
3897 | |
3898 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
3899 Refactored. Removed the old code and only leave the new service. Following | |
3900 XPaths are evaluated on the incomming document: | |
3901 | |
3902 "/art:meta/art:artifact-id/@value" The UUID of the artifact. Optional. | |
3903 Used to fill the template enviroment. | |
3904 "/art:meta/art:user-id/@value" The UUID of the user. Optional. | |
3905 If given the user specific template is filled. | |
3906 "/art:meta/art:outs/@value" The list of outs used to recommend for the | |
3907 various outputs. | |
3908 "/art:meta/art:parameters/@value" A list of key/value pairs to inject more | |
3909 filters to the templating. | |
3910 | |
3911 * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: | |
3912 Change to follow the new recommendations semantics. | |
3913 | |
3914 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
3915 Added symbolic constants to distinguish "user" and "system" db connections. | |
3916 | |
3917 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3918 | |
3919 * doc/conf/conf.xml: | |
3920 Cosmetics, let comments start with a capital and end on a full stop, | |
3921 removed incorrect comment. | |
3922 | |
3923 2011-08-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
3924 | |
3925 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
3926 Cosmetics, let comments start with a capital and end on a full stop. | |
3927 | |
3928 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3929 | |
3930 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java(extractOutputNames): | |
3931 Fixed potential NPE. | |
3932 | |
3933 2011-08-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3934 | |
3935 Added support for more than one db connection in datacage templating. | |
3936 | |
3937 * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: | |
3938 Now you can pass a list of named db connections to the build process. | |
3939 The purpose is to mix more then one database (e.g. the backend db and | |
3940 the user specific one). | |
3941 | |
3942 To use this feature you can add an "connection" attribute | |
3943 to <dc:context> with the name of the connection to use. | |
3944 If no connection name is given the last used is used again. | |
3945 Initially the first connection in the given list is used. | |
3946 If the context is left the connection that was active before | |
3947 will be active again in a stacking manner. | |
3948 | |
3949 When creating NamedConnection objects you can set a boolean flag | |
3950 if the results coming from the connection should be cached. This | |
3951 is useful e.g. for the user specific database which runs in-memory | |
3952 so caching would introduce some superfluous overhead. | |
3953 | |
3954 * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: | |
3955 When executing the queries explicitly pass if caching should be used. | |
3956 | |
3957 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3958 | |
3959 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3960 Forgot to fetch dialect dependent SQL statement for deleting | |
3961 artifacts by uuid. | |
3962 | |
3963 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3964 | |
3965 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3966 Set the name of the collections at initial scan, too. | |
3967 | |
3968 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3969 | |
3970 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3971 Fixed wrong SQL references. | |
3972 | |
3973 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3974 | |
3975 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3976 Fixed two NPEs. | |
3977 | |
3978 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3979 | |
3980 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java, | |
3981 src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3982 Forwarded kill collections and artifacts events to datacage. | |
3983 | |
3984 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
3985 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
3986 Added statement to delete artifact by uuid. | |
3987 | |
3988 2011-08-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3989 | |
3990 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
3991 Made it compilable again. The signature of BackendListener has changed. | |
3992 | |
3993 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3994 | |
3995 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
3996 Completed the backend listener stuff. | |
3997 | |
3998 TODO I: Added some cleanup for orphaned artifacts. | |
3999 TODO II: Figure out a way to delete collections/artifacts | |
4000 which are delete from backend without the | |
4001 backend API. | |
4002 | |
4003 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
4004 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
4005 Added needed statements. | |
4006 | |
4007 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4008 | |
4009 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4010 Update collection names on change. Remove artifacts from collections. | |
4011 | |
4012 * src/main/resources/datacage-sql/org-h2-driver.properties, | |
4013 src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
4014 Added needed statements. | |
4015 | |
4016 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4017 | |
4018 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
4019 Call datacage with the global context. This is needed to access the state engine. | |
4020 | |
4021 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: Changed | |
4022 signatures to take the global context, too. Create artifacts via backend listener | |
4023 interface. | |
4024 | |
4025 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4026 | |
4027 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
4028 Fixed recursion bug. | |
4029 | |
4030 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4031 | |
4032 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
4033 Added debug output. | |
4034 | |
4035 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4036 | |
4037 * doc/conf/conf.xml: Added backend listener for datacage. | |
4038 | |
4039 * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: | |
4040 New. Proxies backend listener calls to datacage. | |
4041 | |
4042 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4043 Implements backend listener. TODO: Update the datacage database | |
4044 according the change calls. | |
4045 | |
4046 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4047 | |
4048 * src/main/java/de/intevation/flys/artifacts/services/meta, | |
4049 src/main/java/de/intevation/flys/artifacts/datacage/templating: | |
4050 Moved/renamed package to better fit the common semantics. | |
4051 DataCage.java is now call NoneUserSpecific.java to reflect the | |
4052 fact that it is the template for the user independent db | |
4053 analysis. | |
4054 | |
4055 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, | |
4056 src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4057 Ajusted imports and calls. | |
4058 | |
4059 2011-08-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4060 | |
4061 * doc/conf/conf.xml: For documentation purposes added a out-commented | |
4062 section with the default configuration of the datacage. | |
4063 | |
4064 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4065 | |
4066 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4067 Delete the artifacts at before initial scan, too. They are independent | |
4068 from users. Fixed problem when writing state data content. | |
4069 | |
4070 * src/main/resources/datacage-sql/org-h2-driver.properties: Added | |
4071 statement to delete the artifacts at initial scan, too. | |
4072 | |
4073 * src/main/resources/datacage-sql/org-postgresql-driver.properties: | |
4074 New. PostgreSQL version of the statements. The database scheme | |
4075 is the same as H2. Very useful for debugging. | |
4076 | |
4077 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4078 | |
4079 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4080 Added kludge for the types of artifact data. They seem to be null | |
4081 in some circumstances. Needs to be debugged! | |
4082 | |
4083 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4084 | |
4085 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
4086 Fixed default connection URL to use a namend in-mermory database. | |
4087 | |
4088 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4089 | |
4090 * doc/conf/datacage.sql: Fixed constraint. | |
4091 | |
4092 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4093 Added some debug output. | |
4094 | |
4095 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4096 | |
4097 * doc/conf/datacage.sql: Removed artifact_id from facet because there | |
4098 is a link via out_id -> outs.id: artifact_id -> artifacts to | |
4099 find the corresponding artifact. | |
4100 | |
4101 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4102 src/main/resources/datacage-sql/org-h2-driver.properties: Store | |
4103 facets of outs into datacage db at initial scan. | |
4104 | |
4105 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4106 | |
4107 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4108 src/main/resources/datacage-sql/org-h2-driver.properties: | |
4109 Store outs of artifacts into datacage db at initial scan. | |
4110 TODO: store facets. | |
4111 | |
4112 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4113 | |
4114 * doc/conf/datacage.sql: Added 'type' column in artifacts data. | |
4115 Maybe useful for filtering. | |
4116 | |
4117 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4118 src/main/resources/datacage-sql/org-h2-driver.properties: | |
4119 Store artifact data into db at initial scan. | |
4120 TODO: store outs and facets. | |
4121 | |
4122 2011-07-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4123 | |
4124 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4125 src/main/resources/datacage-sql/org-h2-driver.properties: | |
4126 Add artifacts into datacage db at initial scan. | |
4127 TODO: Store data, outs and facets. | |
4128 | |
4129 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4130 | |
4131 * doc/conf/datacage.sql: Fixed spelling in sequence name. | |
4132 | |
4133 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4134 src/main/resources/datacage-sql/org-h2-driver.properties: Simply add | |
4135 collection item at initial scan if artifact was stored before. | |
4136 TODO: Store new artifacts. | |
4137 | |
4138 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4139 | |
4140 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4141 src/main/resources/datacage-sql/org-h2-driver.properties: Add | |
4142 collections at initial scan. | |
4143 | |
4144 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4145 | |
4146 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4147 src/main/resources/datacage-sql/org-h2-driver.properties: Add users | |
4148 at initial scan. | |
4149 | |
4150 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4151 | |
4152 * doc/conf/datacage.sql: Using sequences for id generation now | |
4153 to make schema more compatible. | |
4154 | |
4155 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4156 | |
4157 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, | |
4158 src/main/resources/datacage-sql/org-h2-driver.properties: Clear database | |
4159 before initial scan. | |
4160 | |
4161 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4162 | |
4163 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
4164 Deleted. This stuff comes from the artifact database now. | |
4165 | |
4166 * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: | |
4167 New. The db config of the datacage database. | |
4168 | |
4169 * src/main/resources/datacage-sql/org-h2-driver.properties: New. | |
4170 The SQL statements needed for the datacage. | |
4171 | |
4172 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4173 Make use of the db config. | |
4174 | |
4175 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4176 | |
4177 * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: | |
4178 New. A artifact database lifetime listener to build the initial | |
4179 index of the artifacts in database. | |
4180 | |
4181 * doc/conf/conf.xml: Added the datacage to the list of lifetime | |
4182 listeners. | |
4183 | |
4184 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4185 | |
4186 * doc/conf/datacage.sql: Added an explicit table for the outs | |
4187 of an artifact. | |
4188 | |
4189 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
4190 Make the current outs of an artifact accessible only with | |
4191 the global context. | |
4192 | |
4193 2011-07-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4194 | |
4195 * doc/conf/datacage.sql: Added ON DELETE CASCADE constraints. | |
4196 Added state in facet. | |
4197 | |
4198 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4199 | |
4200 * doc/conf/datacage.sql: New. H2 Schema for the datacage database. | |
4201 Uses special features like IDENTITY (autoincrement) typed columns. | |
4202 | |
4203 * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: | |
4204 Pooled connection. | |
4205 | |
4206 * pom.xml: Added dependencies to H2 and Apache DBCP. | |
4207 | |
4208 2011-07-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4209 | |
4210 * src/test/java/de/intevation/flys/artifacts/AppTest.java, | |
4211 src/main/java/de/intevation/flys/artifacts/App.java: Removed. | |
4212 This the stupid "Hello, World!" app initially created by the | |
4213 maven archetype. It was never used. | |
4214 | |
4215 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4216 | |
4217 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4218 Argh! Usage the DOM was not thread safe (discovered with ab). | |
4219 | |
4220 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4221 | |
4222 * doc/conf/meta-data-template.xml: '$recommended' lead to XPath | |
4223 errors. Using "dc:contains($parameters, 'recommended')" helps. | |
4224 | |
4225 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java, | |
4226 src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
4227 Added some debugging. | |
4228 | |
4229 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4230 Added parameters as 'parameters' to parameters. Usefull to check | |
4231 for containment of variables. | |
4232 | |
4233 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4234 | |
4235 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4236 Added 'if log.isDebugEnabled() {}'. | |
4237 | |
4238 2011-07-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4239 | |
4240 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4241 Made Artifact UUID optional and accept extra parameters, too. This enables | |
4242 the service to be used without an arttifact and test all filters. | |
4243 | |
4244 <art:meta xmlns:art="http://www.intevation.de/2009/artifacts"> | |
4245 <art:outs value="computed_discharge_curve,floodmap"/> | |
4246 <art:parameters value="river:Elbe"/> | |
4247 <art:filters value="recommended"/> | |
4248 </art:meta> | |
4249 | |
4250 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
4251 'contain' accept Maps and collection, too. | |
4252 | |
4253 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4254 Made artifact option (= null) in recommendations. | |
4255 | |
4256 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4257 | |
4258 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
4259 Moved connection specific into inner class. The enables the reuse of the | |
4260 compiled statement. | |
4261 | |
4262 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: The | |
4263 SQL statements are now only compiled once at creation time of the builder. | |
4264 Each connection now reuses them. | |
4265 | |
4266 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4267 | |
4268 * doc/conf/cache.xml: Added configuration for static datacage db access. | |
4269 | |
4270 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: Using | |
4271 caches seems to need an explicit System.exit(). | |
4272 | |
4273 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
4274 Added support for caching the SQL statements and there results. | |
4275 | |
4276 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: Some | |
4277 clean up. Reordered code for performance. Strip SQL statements more | |
4278 aggressively. | |
4279 | |
4280 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
4281 Made it Serializable. | |
4282 | |
4283 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
4284 Introduced system property 'flys.artifacts.cache.config.file' to make | |
4285 the caching configurable without pulling up the whole stack. | |
4286 | |
4287 2011-07-22 Ingo Weinzierl <ingo@intevation.de> | |
4288 | |
4289 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4290 Prepared the FLYSArtifactCollection to support the storage of already | |
4291 loaded recommendations in its attribute document. | |
4292 | |
4293 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4294 | |
4295 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4296 Adjusted to use the DataCage recommendations. The incomming document | |
4297 can pass the artifacts UUID by '/art:outs/@value' the outs as a | |
4298 comma separated list in '/art:outs/@value' and optional a set of | |
4299 filters comma separated in '/art:filters/@value'. | |
4300 | |
4301 If UUID and OUTS are not given the old service is used. This | |
4302 should be removed as soon as the client uses the new service. | |
4303 | |
4304 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4305 | |
4306 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
4307 Allow '-' in variable names. | |
4308 | |
4309 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
4310 | |
4311 * doc/conf/meta-data-template.xml: Now, the river-id is really added to | |
4312 the factory node of the wmsbackground layer. | |
4313 | |
4314 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
4315 | |
4316 * doc/conf/meta-data-template.xml: Added the river-id to the factory node | |
4317 of the riveraxis and wmsbackground layer. | |
4318 | |
4319 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4320 | |
4321 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, | |
4322 src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, | |
4323 src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
4324 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
4325 Adjusted to implement changed Service interface. | |
4326 | |
4327 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
4328 | |
4329 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Refactored | |
4330 the method that retrieves the Outputs for the Artifact. Now, we are able | |
4331 to query the Outputs for the current state, and all outputs separately. | |
4332 | |
4333 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: The | |
4334 recommendations provided by this monitor will take the Outputs of the | |
4335 current state only into account. | |
4336 | |
4337 2011-07-21 Ingo Weinzierl <ingo@intevation.de> | |
4338 | |
4339 * doc/conf/meta-data-template.xml: Added conditions for each output type. | |
4340 Splitted the "floodmap" output into two parts: a recommended one and a | |
4341 complete one. The recommended part will only build the document tree for | |
4342 the recommended artifacts; the complete part will build the whole document | |
4343 tree that is available for a floodmap. | |
4344 | |
4345 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
4346 This Hook now uses the DataCage to generate the recommended artifacts. | |
4347 The output-defaults configurtion is needless now. | |
4348 | |
4349 * doc/conf/output-defaults.xml: Removed. The configuration of recommended | |
4350 artifacts takes place in meta-data-template.xml. | |
4351 | |
4352 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4353 Bugfix: the DataCage didn't start working if its builder was NOT null, | |
4354 but it shouldn't start if the builder IS null. | |
4355 | |
4356 2011-07-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4357 | |
4358 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4359 Now it is possible to directly pass a Node as a root to the builder. | |
4360 The owning document if fetch by Node.getOwnerDocument(). This is | |
4361 useful if you want to generate the recommendation directly into | |
4362 an already existing document under a given node. | |
4363 | |
4364 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4365 Changed the signature of recommend() to accept a node where to | |
4366 append the recommendations. | |
4367 | |
4368 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4369 | |
4370 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4371 Added a macro mechanism: | |
4372 | |
4373 <dc:macro name="keine-fuenf"> | |
4374 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
4375 </dc:macro> | |
4376 <dc:call-macro name="keine-fuenf"/> | |
4377 <dc:call-macro name="keine-fuenf"/> | |
4378 <dc:call-macro name="keine-fuenf"/> | |
4379 | |
4380 Macros can be defined everywhere in the template | |
4381 with 'macro'. There bodies can contain all valid elements | |
4382 including other 'macro's and 'call-macro's. They are | |
4383 called with their 'name' with 'call-macro'. The control flow | |
4384 is continued inside the body of the called macro and | |
4385 will continue right after the calling 'call-macro' when | |
4386 the macro body is finished. | |
4387 | |
4388 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4389 | |
4390 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4391 Added a new 'if' construct similiar to XSLT: | |
4392 | |
4393 <dc:if test="not(dc:contains($outs, '5'))"> | |
4394 <dc:text>'5' ist nicht in der Liste der Outs.</dc:text> | |
4395 </dc:if> | |
4396 | |
4397 The control flow is continued inside the 'if' if the 'test' attribute | |
4398 as an XPath expression on an empty document evalutes to true. | |
4399 Else the inside is skipped. There is no 'else'. Use 'choose'/'otherwise' | |
4400 if you need this. | |
4401 | |
4402 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4403 | |
4404 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4405 Added a recommend() method to generate recommendations for | |
4406 a given artifact, outs and extra parameters. | |
4407 | |
4408 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added | |
4409 method to extract all data at once. | |
4410 | |
4411 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4412 | |
4413 * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: | |
4414 New. Custom XPath function provider. Provides | |
4415 'dc:contains(Object [] haystack, Object needle)' by now. Should be | |
4416 useful to check containments in 'out' lists later. | |
4417 | |
4418 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4419 Register the FunctionResolver to the evaluated XPaths. | |
4420 | |
4421 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
4422 Added code to parse | |
4423 "param:a,b,c" to "param" -> new String [] { "a", "b", "c" } to | |
4424 help testing the 'dc:contains' XPath function. | |
4425 | |
4426 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4427 | |
4428 * doc/conf/conf.xml: Added wms configurations for Saar, Mosel and Elbe. | |
4429 Each river supported by FLYS requires such a WMS configuration. A WMS | |
4430 should contain layers for the river axis, buildings, kilometer labels | |
4431 and maybe a background layer as well. | |
4432 | |
4433 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
4434 Added key that is used to store a map of WMS URLs - for each river a | |
4435 WMS URL. | |
4436 | |
4437 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
4438 Parse the river WMS from global configuration. | |
4439 | |
4440 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
4441 Create WMSLayerFacets with URLs based on the river and the river wms | |
4442 configuration stored in the FLYSContext. | |
4443 | |
4444 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
4445 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: | |
4446 Adapted the initialize() signature and the method call of computeInit() | |
4447 which requires a FLYSContext to retrieve the river WMS configurations. | |
4448 | |
4449 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
4450 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
4451 Added the context object parameter to the computeInit() method. | |
4452 | |
4453 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call | |
4454 initialize() with the context object - which is a FLYSContext or a | |
4455 CallContext. | |
4456 | |
4457 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4458 | |
4459 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: | |
4460 Check if builder was created properly before using it. | |
4461 | |
4462 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
4463 Implements now variable provider for XPath expressions. | |
4464 | |
4465 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
4466 Added new choose/when/otherwise construct similiar to XSLT | |
4467 | |
4468 <dc:choose> | |
4469 <dc:when test="$river = 'Mosel'"> | |
4470 <dc:text>Es ist die Mosel.</dc:text> | |
4471 </dc:when> | |
4472 <dc:when test="$river = 'Saar'"> | |
4473 <dc:text>Es ist die Saar.</dc:text> | |
4474 </dc:when> | |
4475 <dc:otherwise> | |
4476 <dc:text>Es ist weder Mosel noch Saar.</dc:text> | |
4477 </dc:otherwise> | |
4478 </dc:choose> | |
4479 | |
4480 A 'choose' block can contain a list of 'when's and an optional | |
4481 'otherwise'. For each 'when' the test attribute is evaluated | |
4482 as an XPath expression on an empty document. The result of | |
4483 the evaluation is taken as a boolean value. If its value is | |
4484 true the control flow is continued inside the corresponding | |
4485 'when' and the other choose elements are not tested. | |
4486 If the value is values the testing continues with the next | |
4487 'when'. If no 'test' expression is evaluated to true, the | |
4488 control flow continues inside the 'otherwise'. If no 'otherwise' | |
4489 is given nothing happens at all. | |
4490 | |
4491 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4492 | |
4493 * doc/conf/conf.xml: Added a config section for floodmaps. Currently, the | |
4494 background layer's url and layername is defined here. | |
4495 | |
4496 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
4497 Read the background layer configuration from conf.xml. Those values are | |
4498 used to create the WMSLayerFacet. | |
4499 | |
4500 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4501 | |
4502 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: | |
4503 The background layer facet will no longer have an extent set. | |
4504 | |
4505 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4506 | |
4507 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
4508 src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: | |
4509 Set the extent of the created WMSLayerFacets and i18n its descriptions. | |
4510 | |
4511 * src/main/resources/messages.properties, | |
4512 src/main/resources/messages_de_DE.properties, | |
4513 src/main/resources/messages_en.properties, | |
4514 src/main/resources/messages_de.properties: Added I18N strings for the | |
4515 background an river axis layer. | |
4516 | |
4517 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4518 | |
4519 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4520 This facet type has a method to set the extent of a WMS layer. The | |
4521 extent is written to the facets XML node in toXML() as well. | |
4522 | |
4523 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4524 | |
4525 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
4526 the signature of setup() which requires a CallMeta parameter now. | |
4527 | |
4528 * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, | |
4529 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: Use | |
4530 the CallMeta object retrieved in setup() to call initialize(). It is now | |
4531 able to i18n things. | |
4532 | |
4533 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4534 | |
4535 * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: New. | |
4536 Standalone app to debug the datacage template. To use in a maven environment: | |
4537 | |
4538 -Dmeta.data.template=PATH_TO_META_DATA-TEMPLATE.XML \ | |
4539 -Dmeta.data.parameters=river:Mosel \ | |
4540 -Dmeta.data.output=OUTPUT.XML \ | |
4541 -Dflys.backend.user=DB_USER \ | |
4542 -Dflys.backend.password=DB_PASSWORD \ | |
4543 -Dflys.backend.url=DB_CONNECTION_URL \ | |
4544 -Dexec.mainClass=de.intevation.flys.artifacts.services.meta.App | |
4545 | |
4546 2011-07-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4547 | |
4548 * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: | |
4549 New. First step to factor out the "Datenkorb" logic into a service independent | |
4550 singleton. | |
4551 | |
4552 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4553 Uses the "Datenkorb" singleton now. | |
4554 | |
4555 2011-07-20 Ingo Weinzierl <ingo@intevation.de> | |
4556 | |
4557 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
4558 Removed "index" property, because it is already existing in parent | |
4559 class. | |
4560 | |
4561 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4562 | |
4563 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4564 Improved error handling. | |
4565 | |
4566 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4567 | |
4568 * src/main/resources/metadata/template.xml: Deleted. | |
4569 | |
4570 * doc/conf/meta-data-template.xml: New. Was template.xml | |
4571 | |
4572 * doc/conf/conf.xml: Made meta data template configurable. | |
4573 | |
4574 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
4575 Load template from configuration not from resources. | |
4576 | |
4577 2011-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4578 | |
4579 * src/main/resources/metadata/template.xml: s/[a-z]+-id/db-id/ | |
4580 Make database ids identifiable with unique name "db-id". | |
4581 | |
4582 2011-07-19 Ingo Weinzierl <ingo@intevation.de> | |
4583 | |
4584 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
4585 Override the toXML() method. Subclasses can now write their own XML | |
4586 representation. | |
4587 | |
4588 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | |
4589 New. This ManagedFacet uses an Element (DOM) to store the information | |
4590 about a facet. The intent of this facet type is to represent a facet | |
4591 stored in an Collection attribute. Different facets can have different | |
4592 attributes that we need to parse, but the only thing ManagedFacets need | |
4593 to do, is to adjust the attributes "active" and "position". So, those | |
4594 values are set directly on the Element, the other attributes aren't | |
4595 touched. | |
4596 | |
4597 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: | |
4598 New. This facet is a wrapper for another facet. This subclass of a | |
4599 ManagedFacet overrides the toXML() method. The XML representation is | |
4600 defined by the inner facet that is stored as member variable. The | |
4601 ManagedFacet specific attributes "artifact", "facet", "pos" and "active" | |
4602 are added manually. | |
4603 | |
4604 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Uses | |
4605 the toXML() method to write a facet node into the attribute document. | |
4606 | |
4607 * src/main/java/de/intevation/flys/collections/AttributeParser.java: Uses | |
4608 the ManagedDomFacet to save the information of a facet which is | |
4609 contained in the attribute part of a Collection's DESCRIBE document. | |
4610 | |
4611 * src/main/java/de/intevation/flys/collections/OutputParser.java: Uses the | |
4612 ManagedFacetAdapter to save a facet, because we want to keep the | |
4613 specific facet to be able to write its specific XML representation into | |
4614 the Collection's DESCRIBE document. | |
4615 | |
4616 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4617 Adapted the XPath of facets stored in the attribute part of the | |
4618 DESCRIBE. | |
4619 | |
4620 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
4621 | |
4622 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
4623 method that returns the Outputs for the Artifact. | |
4624 | |
4625 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
4626 Adapeted the call of OutputParser. | |
4627 | |
4628 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
4629 Simplified the code to read the Outputs of Artifacts. This parser will | |
4630 now longer parse the DESCRIBE documents of the Artifacts, but query the | |
4631 Outputs via FLYSArtifact.getOutputs() directly. | |
4632 | |
4633 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
4634 | |
4635 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
4636 src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | |
4637 Adapted the function call of ProtocolUtils.appendOutputModes(). | |
4638 | |
4639 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4640 Override toXML() to add the URL and layernames to the XML representation | |
4641 of this facet. | |
4642 | |
4643 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
4644 | |
4645 * doc/conf/artifacts/wmsbackground.xml, | |
4646 doc/conf/artifacts/riveraxis.xml: New configurations for an Artifact | |
4647 that is used as background layer in floodmaps, and an artifact that is | |
4648 used as layer showing the river axis in a floodmap. | |
4649 | |
4650 * doc/conf/output-defaults.xml: New file to configure default artifacts | |
4651 for specific output states. E.g. the floodmap state recommends a | |
4652 background layer and a layer displaying the river axis. In suche case, | |
4653 the floodmap state recommends two artifacts for the two layers. | |
4654 | |
4655 * doc/conf/conf.xml: Added new artifacts/artifact-factories and a Hook to | |
4656 monitor artifacts (-> CollectionMonitor.java). | |
4657 | |
4658 * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: | |
4659 New. This facet is used to represent a layer in a map. So, this facet | |
4660 stores information about a WMS URL and the layer names provided by this | |
4661 WMS. | |
4662 | |
4663 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4664 facet types for the wmsbackground and riveraxis. | |
4665 | |
4666 * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, | |
4667 src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: | |
4668 New. An artifact and its default state. The intent of these classes is | |
4669 to generate WMSLayerFacets which represent background layers in maps. | |
4670 | |
4671 * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, | |
4672 src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: New. | |
4673 An artifact and its default state. The intent of these classes is to | |
4674 generate WMSLayerFacets which represent layers that display a river | |
4675 axis. | |
4676 | |
4677 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
4678 Added the INIT ComputeType. | |
4679 | |
4680 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
4681 case for the INIT ComputeType while computing data. | |
4682 | |
4683 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
4684 | |
4685 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
4686 Added a method computeInit() which is called to initialize data/facets | |
4687 after an artifact has been created. | |
4688 | |
4689 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Repaired | |
4690 broken XPath. | |
4691 | |
4692 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
4693 | |
4694 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: | |
4695 Removed the code to generate new artifacts. Instead of creating new | |
4696 artifacts automatically, we decided to suggest creating new artifacts | |
4697 from specific types. Therefore, the DESCRIBE document of the artifacts | |
4698 is extended with a node that contains recommended artifact types. | |
4699 | |
4700 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
4701 FLYSArtifacts might be setup with the identifier of an other | |
4702 FLYSArtifact. Subclasses are able to override a method called | |
4703 initialize(Artifact, GlobalContext). This might be helpful to extract | |
4704 required values or clone artifacts. | |
4705 | |
4706 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
4707 | |
4708 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
4709 Adapted the signature of createArtifactContext() - it returns an | |
4710 instance of GlobalContext now. | |
4711 | |
4712 2011-07-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4713 | |
4714 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
4715 Debugged the water fill algorithm. Added a lot of logging. | |
4716 | |
4717 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4718 Added a text field to give a water level to fill in. | |
4719 | |
4720 2011-07-14 Ingo Weinzierl <ingo@intevation.de> | |
4721 | |
4722 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
4723 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved code | |
4724 to create the output modes based on the given facets to FLYSArtifact. In | |
4725 addition, FLYSArtifact got a new method that returns a specific input | |
4726 value as string. | |
4727 | |
4728 * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: New. | |
4729 This hook monitors the "post-feed" and "post-advance". If the monitored | |
4730 Artifact's state has configured recommended artifacts, this hook will | |
4731 create new Artifacts. | |
4732 | |
4733 TODO: We have to add the UUIDs of the new Artifacts to the DESCRIBE | |
4734 document of the artifact to let the client know, that there are new | |
4735 recommended Artifacts. | |
4736 | |
4737 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: New. | |
4738 This Artifact is the base class for Artifacts, that represent static | |
4739 data. E.g. this could be a decoration theme in a chart or a background | |
4740 layer in the map. | |
4741 | |
4742 * src/main/java/de/intevation/flys/artifacts/states/OutputState.java: New. | |
4743 This state might be used as base class for states, that doesn't require | |
4744 any user input, but only provide static Facets added by a computeFeed() | |
4745 operation. So, subclasses need to implement computeFeed() only. | |
4746 | |
4747 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4748 | |
4749 * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: | |
4750 New. Standalone Swing-App to test cross sections from database without the | |
4751 hassles of our complete software stack. Runnable from a maven environment: | |
4752 | |
4753 $ mvn -e \ | |
4754 -Dflys.backend.user=DB_USER \ | |
4755 -Dflys.backend.password=DB_PASSWD \ | |
4756 -Dflys.backend.url=DB_CONNECTION_URL \ | |
4757 -Dexec.mainClass=de.intevation.flys.artifacts.charts.CrossSectionApp \ | |
4758 exec:java | |
4759 | |
4760 You can set the river to be used with the system property 'river'. | |
4761 Defaults to 'Mosel'. | |
4762 | |
4763 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: | |
4764 Removed superfluous imports. | |
4765 | |
4766 2011-07-13 Ingo Weinzierl <ingo@intevation.de> | |
4767 | |
4768 * doc/conf/artifacts/winfo.xml: The FloodMapState has a new Outputmode | |
4769 called "floodmap" now. | |
4770 | |
4771 * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: New. | |
4772 This facet is used to generate WSPLGEN results. | |
4773 | |
4774 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added | |
4775 the WSPLGENFacet. | |
4776 | |
4777 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
4778 This state will now generate WSPLGENFacets. | |
4779 | |
4780 2011-07-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4781 | |
4782 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: | |
4783 Fixed corner case. | |
4784 | |
4785 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4786 | |
4787 * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: New. | |
4788 fillWater() generates a list of wet lines for a given profile and a | |
4789 given water level. | |
4790 | |
4791 2011-07-08 Ingo Weinzierl <ingo@intevation.de> | |
4792 | |
4793 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
4794 Outputs created while generating the DESCRIBE document will now have the | |
4795 'type' member set. | |
4796 | |
4797 * src/main/java/de/intevation/flys/collections/OutputParser.java: Read the | |
4798 'type' member from DESCRIBE document. | |
4799 | |
4800 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
4801 | |
4802 * doc/conf/artifacts/winfo.xml: Removed a typo. | |
4803 | |
4804 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
4805 | |
4806 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: | |
4807 DataFacet are now able to store the ID of the state which has created | |
4808 this Facet. | |
4809 | |
4810 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
4811 Initialize DataFacets with the ID of this state. This is necessary to | |
4812 renew the waterlevel data if it is no longer existing in the cache. | |
4813 | |
4814 2011-07-06 Ingo Weinzierl <ingo@intevation.de> | |
4815 | |
4816 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: A | |
4817 report facet can now store the state's id and the artifact's hash value | |
4818 when it has been created. | |
4819 | |
4820 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
4821 Initialize the ReportFacet and WaterlevelFacet with state id and hash | |
4822 information. This has been necessary to retrieve reports and waterlevels | |
4823 in states after this one - in states that we need to enter for floodmap | |
4824 parameterization. | |
4825 | |
4826 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
4827 | |
4828 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
4829 Changed the desired UI provider. | |
4830 | |
4831 2011-07-05 Ingo Weinzierl <ingo@intevation.de> | |
4832 | |
4833 * doc/conf/artifacts/winfo.xml: Added the option to continue the | |
4834 waterlevel parameterization with the intent to create flood maps. | |
4835 | |
4836 * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
4837 This state is no longer a final state. The user has the option to | |
4838 continue with the parameterization for flood maps based on the current | |
4839 waterlevel. Therefore, this states desires the "continue" UI provider. | |
4840 Clients should recognice this to just step to the next state or display | |
4841 a button that lets the user step to the next state manually. | |
4842 | |
4843 * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, | |
4844 src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, | |
4845 src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, | |
4846 src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, | |
4847 src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, | |
4848 src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: | |
4849 New. These states are used to parameterize a further calculation type: | |
4850 flood map. | |
4851 | |
4852 * src/main/resources/messages.properties, | |
4853 src/main/resources/messages_de_DE.properties, | |
4854 src/main/resources/messages_en.properties, | |
4855 src/main/resources/messages_de.properties: Required strings for the | |
4856 flood maps states. | |
4857 | |
4858 2011-07-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4859 | |
4860 Fix(?) for flys/issue114 | |
4861 | |
4862 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
4863 Make guessing a bit more robust. | |
4864 | |
4865 2011-07-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4866 | |
4867 Added the math needed to calculate "W-Differenzen" in "Laengsschnitten". | |
4868 Needs testing! | |
4869 | |
4870 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
4871 Made it an interface to be usable in more than one inheritance chain. | |
4872 | |
4873 * src/main/java/de/intevation/flys/artifacts/model/NamedObjectImpl.java: | |
4874 Implements the NamedObject interface and is the new base class of | |
4875 WQ and WKmsImpl. | |
4876 | |
4877 * src/main/java/de/intevation/flys/artifacts/model/WKms.java: | |
4878 New. Interface to associate kms with ws. | |
4879 | |
4880 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
4881 Changed the base class to NamedObjectImpl. Renamed getKms(int) | |
4882 to getKm(int) to make clear it return a single scalar value | |
4883 and fullfil the WKms interface. | |
4884 | |
4885 * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: | |
4886 New. Implements the WKms interface. Intended to be a lightweight | |
4887 datastore for "zusaetzliche Laengsschnitte" and as results | |
4888 of the WKmsOperations. | |
4889 | |
4890 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
4891 Changed base class to NamedObjectImpl. | |
4892 | |
4893 * src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java: | |
4894 New. Operations on WKms data. | |
4895 Currently only the SUBTRACTION operation is implemented. This | |
4896 one is needed to calculate the "W-Differenzen". The operation | |
4897 is insensitive about the km directions of the datasets. Missing | |
4898 values are interpolated linear. | |
4899 | |
4900 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4901 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4902 Adjusted to satisfy the signature change of WQKMs. | |
4903 | |
4904 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
4905 | |
4906 * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: New. This | |
4907 XYSeries stores the style information that should be used to render this | |
4908 series. These information are stored as raw XML documents. A public | |
4909 method can be used to apply those style information to a | |
4910 XYLineAndShapeRenderer. | |
4911 | |
4912 Note: The only two attributes currently supported by StyledXYSeries | |
4913 items are "linesize" and "linecolor". | |
4914 | |
4915 * doc/conf/themes.xml: Added some more basic themes for the four | |
4916 calculation methods. | |
4917 | |
4918 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: This | |
4919 generator now tries to apply themes for all series contained in the | |
4920 chart. If a series is no instance of StyledXYSeries, the default | |
4921 renderer is used. | |
4922 | |
4923 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4924 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4925 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4926 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4927 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4928 Removed the code that had been introduced to adapt renderers statically. | |
4929 Now, each of these concrete ChartGenerators instantiates StyledXYSeries | |
4930 items to put the curves into the chart. Those items contain style | |
4931 information now! | |
4932 | |
4933 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
4934 | |
4935 flys/issue135 (Diagramm: Trotz abgeschalteter Themen bleiben Beschriftungen bestehen) | |
4936 | |
4937 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The way | |
4938 to store datasets has changed. Until this revision, the concrete | |
4939 generators managed their own datasets. E.g. the | |
4940 DischargeLongitudinalSectionGenerator had three datasets: w, q and | |
4941 corrected w. Now, there are just two datasets, managed by this base | |
4942 generator - one dataset for the first Y axis and one dataset for the | |
4943 second Y axis. This makes it easier to remove axes, that have no data to | |
4944 be displayed. All concrete chart generators have to add their XYSeries | |
4945 using two methods: addFirstAxisSeries() and addSecondAxisSeries(). | |
4946 | |
4947 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
4948 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
4949 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
4950 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
4951 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
4952 Those concrete chart generators no longer manage datasets themself but | |
4953 they use the two methods described above, to plot the data to the first | |
4954 or second Y axis. | |
4955 | |
4956 2011-07-01 Ingo Weinzierl <ingo@intevation.de> | |
4957 | |
4958 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
4959 Added the option to use a filter to reduce the number of items returned | |
4960 by this service. | |
4961 | |
4962 2011-06-30 Ingo Weinzierl <ingo@intevation.de> | |
4963 | |
4964 flys/issue159 (WINFO: Radiobutton - Ortsauswahl bei "W für ungleichwertigen Abflusslängsschnitt" entfernen) | |
4965 | |
4966 * doc/conf/artifacts/winfo.xml: Changed the kilometer range input for | |
4967 calculation 4. This calculation type requires a kilometer range. So, | |
4968 after choosing the calculation 4, the transition model leads to a state | |
4969 that just allows the input of a kilometer range with no option to | |
4970 enter locations. | |
4971 | |
4972 * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: | |
4973 New. A base state for the kilometer selection for calculations. The | |
4974 target of this state is to provide facets for the duration curves. | |
4975 | |
4976 * src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java: | |
4977 New. This state is used to enter a kilometer range. The difference to | |
4978 the LocationDistanceSelect state is, that there is no option to enter | |
4979 locations. | |
4980 | |
4981 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
4982 Improved this state to be the base state for calculation ranges. | |
4983 | |
4984 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java | |
4985 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java | |
4986 | |
4987 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
4988 state no longer inherits from RangeState which now is used as base | |
4989 state for kilometer ranges. | |
4990 | |
4991 * src/main/resources/messages.properties, | |
4992 src/main/resources/messages_de_DE.properties, | |
4993 src/main/resources/messages_en.properties, | |
4994 src/main/resources/messages_de.properties: Added new i18n strings for | |
4995 the DistanceSelect state. | |
4996 | |
4997 2011-06-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
4998 | |
4999 * pom.xml: Downgraded Trove to 1.1-beta-5, because the new | |
5000 later ones are removed from the maven repos. | |
5001 | |
5002 The functionality we need is in 1.1 so this downgrade should | |
5003 cause no problems. | |
5004 | |
5005 Would be nice if we would support the maintainers of trove to | |
5006 bring there new versions back into the main maven repos. | |
5007 | |
5008 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
5009 | |
5010 * pom.xml: Repaired the JBoss repository which place has changed. | |
5011 | |
5012 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
5013 | |
5014 Tagged RELEASE 2.4 | |
5015 | |
5016 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
5017 | |
5018 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
5019 src/main/java/de/intevation/flys/exports/WstWriter.java: | |
5020 Append the corrected W column (if existing) to the WST export. | |
5021 | |
5022 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5023 | |
5024 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
5025 Guessing increaing w is not based on direct neighbors any more. | |
5026 The second to be compared with is choosen by random of | |
5027 the values before the first one. This makes the guessing | |
5028 more robust against 'plateaus' of equal w values. | |
5029 | |
5030 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5031 | |
5032 * src/main/java/de/intevation/flys/exports/ATWriter.java: Array | |
5033 for constructing the spline was too large leading to non-increasing | |
5034 values. | |
5035 | |
5036 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5037 | |
5038 Fix for flys/issue150 | |
5039 | |
5040 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
5041 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5042 Invert the x axis if its guessed that water is increasing. | |
5043 | |
5044 2011-06-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5045 | |
5046 * src/main/java/de/intevation/flys/artifacts/model/WQ.java(guessWaterIncreasing): | |
5047 Added a method to guess based on a given factor of the size (default 0.05) | |
5048 if the water levels are increasing. Needed to determine in which direction | |
5049 the water level curve should be orientated. Based on random to avoid | |
5050 running over large dataset each time a diagram is generated. | |
5051 | |
5052 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
5053 | |
5054 flys/issue177 (WINFO: Abflusskurven am Pegel verursachen ein Hängen des Servers) | |
5055 | |
5056 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
5057 Commented out code to generate time ranges for series names. There | |
5058 seems to be a problem while loading the discharge tables of a gauge or | |
5059 while determining the start and/or end time of such discharge tables. | |
5060 | |
5061 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5062 | |
5063 * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. | |
5064 | |
5065 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5066 | |
5067 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5068 Removed dead code. | |
5069 | |
5070 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5071 | |
5072 Fix for flys/issue173 | |
5073 | |
5074 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5075 Fixed the way the gauge was found for a given interval. | |
5076 The old way does not work because it was just tested if | |
5077 the station point was inside the segments which is not | |
5078 necessarily true. The obvious solution to simply check | |
5079 the overlapping intervals does not work either because | |
5080 the gauge ranges touch each other and so more than | |
5081 one gauge are returned in these cases. The River.maxOverlap() | |
5082 is now used to find the gauge with the max overlapping | |
5083 range. | |
5084 | |
5085 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5086 | |
5087 Fix for flys/issue147 | |
5088 | |
5089 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
5090 Removed the 'kmUp' flag. It was an left over from former | |
5091 WSP calculations (w/o ref km) leading to wrong results now. | |
5092 | |
5093 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5094 Don't pass the kmUp flag to the calculation. | |
5095 | |
5096 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5097 Added debug output to see the value of 'wq_free'. | |
5098 | |
5099 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5100 | |
5101 Fix for flys/issue86 | |
5102 | |
5103 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5104 The reference gauge for calculations "am Pegel" was determined | |
5105 wrong. | |
5106 | |
5107 2011-06-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5108 | |
5109 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
5110 Conversion w->q was broken. This should fix a number of issues | |
5111 around "W am Pegel" calculations. | |
5112 | |
5113 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5114 Issue an error report if a w->q conversion fails. | |
5115 | |
5116 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5117 The gauge to convert w->q with its discharge table was determined wrong. | |
5118 | |
5119 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
5120 | |
5121 flys/issue174 (Diagramm: Q-Linie wird bei initialem Laden des Diagramms | |
5122 anders dargestellt als bei Ansicht auf gesamten Wertebereich) | |
5123 | |
5124 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5125 The chart will now have upper margins again. | |
5126 | |
5127 2011-06-24 Ingo Weinzierl <ingo@intevation.de> | |
5128 | |
5129 flys/issue172 (Diagramm: Ursprung der Diagramme bei Dauerzahlen) | |
5130 | |
5131 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5132 Charts of this type will have the lower X value set to "0". | |
5133 | |
5134 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5135 | |
5136 * src/main/java/de/intevation/flys/exports/ATWriter.java: | |
5137 Results are now in cm. Made it more robust against corner cases. | |
5138 | |
5139 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5140 Removed superfluous import. | |
5141 | |
5142 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5143 | |
5144 * doc/conf/artifacts/winfo.xml, doc/conf/conf.xml: | |
5145 Added facet config for AT exports. | |
5146 | |
5147 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5148 Added 'at' facet type. | |
5149 | |
5150 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
5151 Generate AT facets. | |
5152 | |
5153 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5154 | |
5155 * src/main/java/de/intevation/flys/exports/ATExporter.java: New. | |
5156 Exporter for AT facets. Needs testing. | |
5157 | |
5158 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5159 | |
5160 * src/main/java/de/intevation/flys/exports/ATWriter.java: New. | |
5161 Writer for AT files. New code because our data model differs | |
5162 from Desktop-FLYS. Needs testing. | |
5163 | |
5164 2011-06-23 Ingo Weinzierl <ingo@intevation.de> | |
5165 | |
5166 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
5167 | |
5168 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5169 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5170 Moved the method that adjusts the X-axis to include the "0" value from | |
5171 ComputedDischargeCurveGenerator to DischargeCurveGenerator. Now, both | |
5172 charts will include the "0" on the X-axis. | |
5173 | |
5174 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5175 | |
5176 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
5177 Based on WQ now to make it exportable as AT. | |
5178 | |
5179 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5180 | |
5181 * src/main/java/de/intevation/flys/artifacts/model/WQ.java: | |
5182 New. Base class for WQKms. | |
5183 | |
5184 TODO 1: make it a base class for WQDay, too, | |
5185 TODO 2: Generate instances of WQ instead of WQKms in "Abflusskurven" | |
5186 calculations. This will save memory. | |
5187 | |
5188 AT exporter will get instances of this class as data model | |
5189 | |
5190 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
5191 Add default constructor to ease inheritance. | |
5192 | |
5193 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
5194 Based on WQ now. Removed code allready defined in base class. | |
5195 | |
5196 2011-06-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5197 | |
5198 * doc/conf/artifacts/winfo.xml: Add TODOs for error reports | |
5199 of "Abflusskurven am Pegel". Maybe we don't need them? | |
5200 | |
5201 * doc/conf/conf.xml: Configure report for each calculated output type. | |
5202 | |
5203 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
5204 | |
5205 flys/issue164 (Berechnung 4: Umgekehrtes Berechnungsintervall führt zur) | |
5206 | |
5207 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
5208 Create the items with range information for W and Q which allows the | |
5209 client to validate the user inserted values. | |
5210 | |
5211 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5212 | |
5213 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5214 Arguments in filling datastructure were flip. Now | |
5215 the "Abflusskurve am Pegel" looks correct again. | |
5216 | |
5217 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
5218 Removed superfluous imports. | |
5219 | |
5220 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5221 | |
5222 Improved situtation on rendering "Abflusskurve am Pegel". Not | |
5223 fully working, yet. | |
5224 | |
5225 * doc/conf/artifacts/winfo.xml: Generate facets for the location path, too. | |
5226 | |
5227 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Misspelled | |
5228 the facet which prevented the facets from being to the outputs. | |
5229 | |
5230 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: | |
5231 Extended to store the hash and the state id of the producing artifact/state | |
5232 else it results in NPEs because the data is calculated on later (wrong) states. | |
5233 | |
5234 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
5235 Store the state id and the hash in the facet, too. | |
5236 | |
5237 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Add two | |
5238 method to do calculations for a state the artifact is currently not in | |
5239 and fetching the current state id. | |
5240 | |
5241 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5242 | |
5243 * doc/conf/artifacts/winfo.xml: Generate facets for "Abflusskurven am Pegel" | |
5244 Not working by now. :-/ | |
5245 | |
5246 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New facet type | |
5247 for "Abflusskurven am Pegel" | |
5248 | |
5249 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Do calculation | |
5250 in the artifact not in the output generator. | |
5251 | |
5252 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
5253 Generate the new facets. | |
5254 | |
5255 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
5256 Fetch data from facet. | |
5257 | |
5258 2011-06-22 Ingo Weinzierl <ingo@intevation.de> | |
5259 | |
5260 flys/issue161 (Diagramm: Q-Achse in W-Längsschnitten immer bei Q=0) | |
5261 | |
5262 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5263 The Q axis (which is the second y axis) initially contains the 0 value. | |
5264 After a zoom action has taken place, this behaviour is no longer | |
5265 supported. | |
5266 | |
5267 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5268 | |
5269 Draw correction curve again. | |
5270 | |
5271 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
5272 Use correction curve to map plot to axes. Not doing so prevented | |
5273 the correction curve from being drawn! | |
5274 Smaller code cleanups and simplifications. | |
5275 | |
5276 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
5277 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
5278 Added methods to directly access the components w, q and c | |
5279 at a given index. | |
5280 | |
5281 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: | |
5282 Attribute access via DOM instead of XPath. | |
5283 | |
5284 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5285 Code simplification. | |
5286 | |
5287 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
5288 | |
5289 flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) | |
5290 | |
5291 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Splitted | |
5292 up zooming for x and y axes to be able to override specific axis | |
5293 zoom behaviour. | |
5294 | |
5295 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
5296 The lower bound of the x axis (which is the Q axis in such chart) is | |
5297 always 0. | |
5298 | |
5299 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
5300 | |
5301 flys/issue90 (Diagramm: Trennung derDiagrammfläche und Achsenaufheben) | |
5302 | |
5303 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
5304 Added a margin between chart data and chart axes. | |
5305 | |
5306 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5307 | |
5308 Fix for flys/issue158 | |
5309 | |
5310 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
5311 Checks for right class now. | |
5312 | |
5313 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5314 | |
5315 Fix for flys/issue154 | |
5316 | |
5317 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
5318 Checks for right class now. | |
5319 | |
5320 2011-06-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5321 | |
5322 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5323 Only generate 'outs' if they have facets. | |
5324 | |
5325 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
5326 'boolean ? true : false' <=> 'boolean' | |
5327 | |
5328 2011-06-21 Ingo Weinzierl <ingo@intevation.de> | |
5329 | |
5330 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5331 Added the time-to-live to the DESCRIBE document. | |
5332 | |
5333 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5334 | |
5335 * doc/conf/artifacts/winfo.xml: Configured states to generate report facets. | |
5336 | |
5337 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5338 | |
5339 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
5340 Return the report. | |
5341 | |
5342 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5343 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5344 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5345 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: | |
5346 Generate report facets if there are problems with the calculations. | |
5347 TODO: Adjust winfo.xml to configure the facets. | |
5348 | |
5349 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5350 | |
5351 * src/main/java/de/intevation/flys/exports/ReportGenerator.java: | |
5352 New. Generator for calculation reports. | |
5353 | |
5354 * doc/conf/conf.xml: Added ReportGenerator. | |
5355 | |
5356 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5357 Added type 'report'. | |
5358 | |
5359 * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: | |
5360 Specialized facet for serving reports. TODO: Added them to the | |
5361 calculation states. | |
5362 | |
5363 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
5364 Looped through CallMeta for i18n purposes. TODO: do i18n | |
5365 | |
5366 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5367 Removed superfluous import. | |
5368 | |
5369 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
5370 Added some override annotations. | |
5371 | |
5372 2011-06-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5373 | |
5374 * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java: | |
5375 New. Used to transport the data and the error report. | |
5376 | |
5377 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
5378 src/main/java/de/intevation/flys/artifacts/model/Calculation1.java, | |
5379 src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, | |
5380 src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, | |
5381 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java, | |
5382 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
5383 src/main/java/de/intevation/flys/artifacts/model/Calculation.java, | |
5384 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5385 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5386 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5387 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5388 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
5389 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
5390 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
5391 Use the CalculationResult now. | |
5392 | |
5393 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5394 | |
5395 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
5396 Allow an explicit reference km to enable calculation "am Pegel". | |
5397 | |
5398 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5399 If a calculation "am Pegel" is done, take start km of the | |
5400 calculation range and find the gauge in which range it is located. | |
5401 Take the station of the gauge as the reference km. If no gauge | |
5402 is found the calcualtion falls back to calculation "auf freier Strecke". | |
5403 | |
5404 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5405 Replaced another inefficient attribute extraction via XPath | |
5406 with direct DOM access. | |
5407 | |
5408 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5409 | |
5410 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5411 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, | |
5412 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
5413 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5414 Removed dead code. | |
5415 | |
5416 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5417 | |
5418 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java | |
5419 src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, | |
5420 src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, | |
5421 src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5422 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
5423 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5424 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5425 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, | |
5426 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5427 Only generate facets when needed. | |
5428 | |
5429 * src/main/java/de/intevation/flys/collections/OutputParser.java: | |
5430 Removed more XPath for simply accessing attributes of an element. | |
5431 | |
5432 * doc/conf/cache.xml: 200 elements in memory for "computed.values" are enough, | |
5433 LRU as eviction strategy is sufficent. | |
5434 | |
5435 * src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
5436 src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Use | |
5437 more 'standard' Java naming conventions. | |
5438 | |
5439 2011-06-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5440 | |
5441 Merged in the facet-slt branch to bring in the 'facet' feature. | |
5442 | |
5443 * doc/conf/artifacts/winfo.xml: Fixed some facets. | |
5444 | |
5445 * doc/conf/cache.xml: Added a "computed.values" cache to store the | |
5446 results of the WINFO calculations. | |
5447 | |
5448 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: | |
5449 Add support for index per facet to make them unique and identifiable. | |
5450 | |
5451 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: | |
5452 New. Inteface to be used to access the facet names of the configuration. | |
5453 | |
5454 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: New. | |
5455 A facet to be used to have raw access to the computed data of an artifact. | |
5456 Useful to export things like CSV and WST. | |
5457 | |
5458 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: New. | |
5459 Specialized facet to access the water level data stored in WQKms arrays. | |
5460 | |
5461 * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: New. | |
5462 Specialized facet to access the duration data stored in WQDay data structures. | |
5463 | |
5464 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Facets are | |
5465 now generated dynamically from the current available ones stored with | |
5466 the artifact. | |
5467 | |
5468 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Added | |
5469 methods computeAdvance() and computeFeed() called if artifact is fed or | |
5470 adance. This overwritten in subclasses to do the state depending calculations. | |
5471 | |
5472 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5473 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
5474 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5475 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5476 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: These | |
5477 states overwrites the computeAdvance() and computeFeed() methods to do | |
5478 the corresponding WINFO calculations. | |
5479 | |
5480 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Calls | |
5481 computeAdvance() and computeFeed() if artifact is fed or advanced. Centralized | |
5482 the caching mechanism. | |
5483 | |
5484 * src/main/java/de/intevation/flys/exports/AbstractExporter.java, | |
5485 src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
5486 src/main/java/de/intevation/flys/collections/OutputParser.java, | |
5487 src/main/java/de/intevation/flys/collections/AttributeWriter.java, | |
5488 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5489 Adjusted the code to cope with the indices of the facets. Used | |
5490 DOM to access the attributes instead of XPath. Removed smaller bugs | |
5491 concerning position generation. | |
5492 | |
5493 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, | |
5494 src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
5495 src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
5496 Forwarded facet references. | |
5497 | |
5498 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
5499 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
5500 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
5501 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
5502 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, | |
5503 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5504 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
5505 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
5506 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
5507 Uses facets to fetch data and generate output now. | |
5508 | |
5509 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
5510 | |
5511 * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that | |
5512 determines the mode of calculation 1. If it is "false" (default), | |
5513 the calculation should be bound to a gauge. | |
5514 | |
5515 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
5516 method to retrieve the information about the "wq_free" parameter. | |
5517 | |
5518 2011-06-17 Ingo Weinzierl <ingo@intevation.de> | |
5519 | |
5520 * doc/conf/artifacts/winfo.xml: Added a facet for corrected W in | |
5521 computation 4. | |
5522 | |
5523 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5524 | |
5525 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
5526 Got rid of namespace in result document. | |
5527 | |
5528 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
5529 | |
5530 flys/issue77 (Diagramm: Beschriftung der Kurven bei Dauerlinien) | |
5531 | |
5532 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5533 Give the curves in the chart names. | |
5534 | |
5535 * src/main/resources/messages.properties, | |
5536 src/main/resources/messages_de_DE.properties, | |
5537 src/main/resources/messages_en.properties, | |
5538 src/main/resources/messages_de.properties: Added titles for duration | |
5539 chart curves. | |
5540 | |
5541 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5542 | |
5543 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
5544 Write top 'Oberkante' and bottom 'Unterkante' to out going XML | |
5545 if they exist. | |
5546 | |
5547 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
5548 | |
5549 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
5550 Write the min/max W/Q ranges as art:range elements into the DESCRIBE. | |
5551 | |
5552 2011-06-14 Ingo Weinzierl <ingo@intevation.de> | |
5553 | |
5554 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
5555 This state that is used to retrieve locations will now write the | |
5556 kilometer range of the selected river into the DESCRIBE document. | |
5557 | |
5558 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5559 | |
5560 * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: | |
5561 New. Factored out version of "Wasserspiegellage" calculation. | |
5562 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
5563 | |
5564 Removed some dead code. | |
5565 | |
5566 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
5567 Added Override annotation and used quick access method. | |
5568 | |
5569 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5570 Looped through error reporting use by interpolate. | |
5571 | |
5572 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5573 Used factored out version of calculation 1. Removed dead code. | |
5574 | |
5575 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5576 | |
5577 * src/main/java/de/intevation/flys/artifacts/model/Calculation2.java: | |
5578 New. Factored out version of "Abflusskurve". | |
5579 | |
5580 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5581 Loop errors through w/q at km interpolation. | |
5582 | |
5583 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5584 Use factored out version of calculation 2. | |
5585 | |
5586 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5587 | |
5588 * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: | |
5589 New. Factored out version of "Dauerzahlen". | |
5590 | |
5591 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5592 Loop errors through for q->w interpolations. | |
5593 | |
5594 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
5595 Added constructor to directly create with calculated results. | |
5596 | |
5597 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
5598 Added method to return the number of problems. | |
5599 | |
5600 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5601 Use factored out version of calculation 3. | |
5602 | |
5603 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5604 | |
5605 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, | |
5606 src/main/java/de/intevation/flys/artifacts/model/WQCKms.java, | |
5607 src/main/java/de/intevation/flys/artifacts/model/WQDay.java: | |
5608 Added methods to remove NaN values. | |
5609 | |
5610 2011-06-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5611 | |
5612 * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: | |
5613 New. Base class for calculations. Used to collect problems occuring | |
5614 during calculation. | |
5615 | |
5616 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5617 Extends Calculation now. Looped through the problem reports to | |
5618 base class. | |
5619 | |
5620 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
5621 Looped through the problem reports. | |
5622 | |
5623 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
5624 | |
5625 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
5626 Append the min/max range and a transformation matrix for each axis. | |
5627 | |
5628 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
5629 Instantiate the InfoGeneratorHelper with a XYChartGenerator instance. | |
5630 | |
5631 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
5632 Changed the zoom operation. The zoom values defined in the chart request | |
5633 document are no longer absolute values for a specific axis. Those values | |
5634 represent percental values for the start and end point of x and y axes. | |
5635 E.g. a chart has three axes with the following ranges: | |
5636 - x axis : 0 - 10 | |
5637 - y axis 1: 20 - 40 | |
5638 - y axis 2: 40 - 90 | |
5639 - zoom values for x: 0.1 - 0.9 (10% - 90%) | |
5640 - zoom values for y: 0.2 - 0.8 (20% - 80%) | |
5641 The produced chart will have the following ranges: | |
5642 - x axis : 1 - 9 | |
5643 - y axis 1: 24 - 36 | |
5644 y axis 2: 50 - 80 | |
5645 | |
5646 2011-06-09 Ingo Weinzierl <ingo@intevation.de> | |
5647 | |
5648 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
5649 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5650 Map datasets to axes correctly. | |
5651 | |
5652 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5653 | |
5654 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5655 Determine the gauges by their station positions. This hopfully | |
5656 fixes the problem with wrong assigned gauges and invalid segments. | |
5657 | |
5658 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5659 | |
5660 * src/main/java/de/intevation/flys/artifacts/model/Segment.java, | |
5661 src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5662 Added more debug output. | |
5663 | |
5664 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
5665 | |
5666 flys/issue103 PART 1 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz) | |
5667 | |
5668 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
5669 Selected values are formatted with the current locale. The static part | |
5670 of the DESCRIBE document will now contain i18n formatted numbers. | |
5671 | |
5672 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
5673 | |
5674 flys/issue93 (WINFO: Benennung der Berechnungsart korrigieren) | |
5675 | |
5676 * src/main/resources/messages_de_DE.properties, | |
5677 src/main/resources/messages_de.properties: Changed the name of | |
5678 calculation 4. | |
5679 | |
5680 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
5681 | |
5682 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
5683 Made the range determination more robust against NaN values. | |
5684 | |
5685 2011-06-08 Ingo Weinzierl <ingo@intevation.de> | |
5686 | |
5687 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
5688 The second y axis is set to position "1". It was set to "2" before, but | |
5689 in that case, there was no position "1". | |
5690 | |
5691 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5692 | |
5693 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
5694 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
5695 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
5696 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
5697 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
5698 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
5699 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
5700 s@m³/s@m\\u00b3/s@ | |
5701 | |
5702 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5703 | |
5704 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
5705 Only generate an axis element if a axis really exists. | |
5706 | |
5707 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5708 | |
5709 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
5710 Simpified array swapping. | |
5711 | |
5712 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5713 | |
5714 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5715 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5716 Use java.util.List instead of java.util.Vector | |
5717 | |
5718 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5719 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5720 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5721 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5722 Removed superfluous imports. | |
5723 | |
5724 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5725 | |
5726 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
5727 createItem() is not abstract any longer to avoid code repetitionin sub classes. | |
5728 | |
5729 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, | |
5730 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
5731 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
5732 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
5733 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, | |
5734 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
5735 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, | |
5736 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
5737 Removed duplicated code, inserted default constructors and Override annotations. | |
5738 | |
5739 2011-06-07 Ingo Weinzierl <ingo@intevation.de> | |
5740 | |
5741 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
5742 Append axes range information to the info document. | |
5743 | |
5744 2011-06-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5745 | |
5746 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5747 If feed() fails do not store invalid values in database. | |
5748 | |
5749 2011-06-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5750 | |
5751 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
5752 Removed asymmetrical "- 1" from width calculation. | |
5753 | |
5754 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5755 | |
5756 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5757 Fixed problem when more than one value per segment are given. | |
5758 | |
5759 2011-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5760 | |
5761 Refactored version of "Berechnung 4" | |
5762 | |
5763 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
5764 Added instance fields for a reference point (= location of gauge) | |
5765 and backup of values (needed for naming). | |
5766 | |
5767 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: | |
5768 Added a constructor to be created from a WQKms. This is helpful | |
5769 if a WQKms is replaced by a back jump correction. | |
5770 | |
5771 * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: | |
5772 New. Outfactored version of "W bei ungleichmaessigen Abflusslaengsschnitt". | |
5773 Much cleaner now and it should have a better handling of the corner | |
5774 cases. | |
5775 | |
5776 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5777 Removed the linear interpolation stuff. It is now in Linear. Removed | |
5778 the LinearRemap interpolation method because it is not needed any | |
5779 longer. Added a method to interpolate a given km with a given | |
5780 function. | |
5781 | |
5782 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5783 Removed the old calc 4 and used the new one. | |
5784 | |
5785 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
5786 Deleted. Not needed any longer. | |
5787 | |
5788 * src/main/java/de/intevation/flys/artifacts/math/Function.java: | |
5789 New. Interface for a uni-variate real function. | |
5790 | |
5791 * src/main/java/de/intevation/flys/artifacts/math/Identity.java: | |
5792 New. Implements Function with f(x) = x | |
5793 | |
5794 * src/main/java/de/intevation/flys/artifacts/math/Linear.java: | |
5795 New. Implements Function with f(x) = m*x + b | |
5796 | |
5797 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5798 Factored some stuff out to DoubleUtil. Removed some dead code. | |
5799 Does some rounding correct. | |
5800 | |
5801 * src/main/java/de/intevation/flys/utils/DoubleUtil.java: New. | |
5802 Centralized utils surrounding common double operations. | |
5803 | |
5804 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
5805 Removed superfluous imports. | |
5806 | |
5807 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
5808 | |
5809 flys/issue90(Diagramm: Trennung der Diagrammfläche und Achsen aufheben) | |
5810 | |
5811 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
5812 Determine the ranges of x and y axes. If no zoom ranges are given, we | |
5813 will determine the min and max xy values in the dataset manually, | |
5814 because JFreeCharts adds a margin to the left and right of the data | |
5815 area automatically.. | |
5816 | |
5817 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
5818 | |
5819 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved | |
5820 the chart creation into an own public method. This lets the | |
5821 ChartInfoGenerator create charts without duplicating code. | |
5822 | |
5823 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: | |
5824 Limited the possible class for generators to XYChartGenerator. This | |
5825 enables the ChartInfoGenerator class to do the whole chart creation | |
5826 stuff itself without outsourcing the code to concrete subclasses. | |
5827 | |
5828 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
5829 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
5830 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
5831 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
5832 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
5833 Removed the code to generate charts - this is done in ChartInfoGenerator | |
5834 now. | |
5835 | |
5836 2011-06-03 Ingo Weinzierl <ingo@intevation.de> | |
5837 | |
5838 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
5839 methods to extract the x and y ranges from request document. | |
5840 | |
5841 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
5842 method that zooms the chart to the specified x and y ranges. | |
5843 | |
5844 2011-06-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5845 | |
5846 * doc/conf/conf.xml: Set collection ttl to 6 hours. | |
5847 | |
5848 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5849 | |
5850 * src/main/java/de/intevation/flys/artifacts/model/Segment.java: | |
5851 New. Parse segments only once. | |
5852 | |
5853 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5854 Expose new parser to artifacts. TODO: Use it. | |
5855 | |
5856 2011-06-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5857 | |
5858 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5859 Changed interpolation methods to interpolate to an arbitrary position | |
5860 in a given double result array as a preparation for segment independent | |
5861 calculation. | |
5862 | |
5863 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5864 Removed superfluous import. | |
5865 | |
5866 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
5867 Fixed cause for crashing: Run back too far in some siutations. | |
5868 | |
5869 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5870 Refactored range code a bit. Needs more work. | |
5871 | |
5872 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
5873 | |
5874 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: | |
5875 Interchange the lower and upper x value of the chart if the x-axis is | |
5876 inverted before the matrix values are computed. Now, the matrix is able | |
5877 to work with charts that have an inverted x-axis. | |
5878 | |
5879 2011-06-01 Ingo Weinzierl <ingo@intevation.de> | |
5880 | |
5881 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: New. A | |
5882 chart info generator generates a document that contains meta information | |
5883 for a specific chart. Concrete instances of this abstract class need to | |
5884 instantiate concrete ChartGenerators and dispatch nearly all methods of | |
5885 an OutGenerator (init(), doOut(), setMaster()) to this instance. The | |
5886 generate() method is implemented in the ChartInfoGenerator itself. It | |
5887 creates a chart with help of the ChartGenerator instance and builds a | |
5888 document that contains meta information of this chart. | |
5889 | |
5890 * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: New. | |
5891 This helper is used to create the chart info document. At the moment, | |
5892 the only information that is included in this document is a | |
5893 transformation matrix to transform image coordinates into chart | |
5894 coordinates. | |
5895 | |
5896 NOTE: The transformation matrix creation needs some work to support | |
5897 charts with inverted X axis. | |
5898 | |
5899 * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, | |
5900 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, | |
5901 src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, | |
5902 src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, | |
5903 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: | |
5904 Concrete instances of ChartInfoGenerator that create the chart info for | |
5905 the currently supported chart types. | |
5906 | |
5907 * doc/conf/conf.xml: Registered new OutGenerators. | |
5908 | |
5909 2011-05-31 Ingo Weinzierl <ingo@intevation.de> | |
5910 | |
5911 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5912 Added support for the 'type' paramter of the collection's out() | |
5913 operation. | |
5914 | |
5915 2011-05-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5916 | |
5917 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
5918 src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
5919 Use an explicit reference km for interpolation now. | |
5920 | |
5921 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5922 | |
5923 * doc/conf/cache.xml: Introduced cache to store the distance info per river. | |
5924 This boosts performance in following ab setup from 3.61 to 39.91 requests/secs. | |
5925 | |
5926 $ ab -c 20 -n 1000 -p distances.xml http://127.0.0.1:8181/service/distanceinfo | |
5927 | |
5928 $ cat distances.xml | |
5929 <?xml version="1.0" encoding="UTF-8"?> | |
5930 <art:river xmlns:art="http://www.intevation.de/2009/artifacts">Elbe</art:river> | |
5931 | |
5932 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: Added | |
5933 an iterator result to avoid construction expensive interim lists. | |
5934 | |
5935 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: Use | |
5936 the cache if configured. | |
5937 | |
5938 2011-05-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5939 | |
5940 flys/issue82 | |
5941 | |
5942 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5943 Only successful interpolations are named. | |
5944 | |
5945 2011-05-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5946 | |
5947 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
5948 Make it work independent of river flow direction. | |
5949 | |
5950 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
5951 Fixed bug in ordering segments | |
5952 | |
5953 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-enabled | |
5954 calculation of the back jump correction. Fixed more flow direction issues. | |
5955 | |
5956 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
5957 | |
5958 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5959 Removed call of XMLDebug class which is not in the version control. | |
5960 | |
5961 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
5962 | |
5963 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5964 Moved the code part that skips themes right after the part that sets the | |
5965 master artifact for the OutGenerator. We need this master artifact to | |
5966 display empty charts - master artifact is used to create titles and | |
5967 axes. | |
5968 | |
5969 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
5970 | |
5971 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5972 Deactivated themes are not put into the chart. | |
5973 | |
5974 2011-05-27 Ingo Weinzierl <ingo@intevation.de> | |
5975 | |
5976 * src/main/java/de/intevation/flys/collections/AttributeParser.java: | |
5977 Repaired broken XPath expressions to find the output modes in an | |
5978 attribute document of a collection. | |
5979 | |
5980 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: This | |
5981 writer will now create a document that has a root node art:attribute. | |
5982 Before these changes, the document's root node was art:outputs which is | |
5983 part of the attribute document but not the right root node. | |
5984 | |
5985 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
5986 Adapted some XPath expressions and corrected the the process to create | |
5987 attribute documents. | |
5988 | |
5989 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
5990 | |
5991 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
5992 Made it work independent of from/to order. | |
5993 | |
5994 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
5995 Added method to extract the ranges correctly from data. | |
5996 | |
5997 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
5998 Use the correct ranges. Comment out backjump detection temporarily. | |
5999 | |
6000 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6001 | |
6002 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
6003 Generate fields for w/q input depend on flow direction. | |
6004 | |
6005 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6006 Moved km up question out of loop. | |
6007 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6008 | |
6009 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6010 Take the flow direction into account. | |
6011 | |
6012 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
6013 Prevent NPE. | |
6014 | |
6015 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: | |
6016 Allow to be 'from' greater than 'to' in ranges. | |
6017 | |
6018 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Negate | |
6019 step if 'from' is greater than 'to'. | |
6020 | |
6021 2011-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6022 | |
6023 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6024 Round exploded values to a precision of 1e-6. | |
6025 | |
6026 2011-05-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6027 | |
6028 Qs are now stored in ranges for each column. | |
6029 | |
6030 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
6031 Deleted. | |
6032 | |
6033 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
6034 Was WstValueTableFactory2. | |
6035 | |
6036 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
6037 node linking bug. Removed dead code. | |
6038 | |
6039 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6040 Q values are now stored in range trees by each column. The qs of the rows | |
6041 are removed and the calculations are adjusted. Removed dead code. | |
6042 | |
6043 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6044 | |
6045 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
6046 Moved cache name to WstValueTableCacheKey. Do not cache null references. | |
6047 | |
6048 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
6049 Moved cache name into this class. | |
6050 | |
6051 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6052 Store QRangeTree for each column of value table. TODO: Use them! | |
6053 | |
6054 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: | |
6055 Intended as a replacement for WstValueTableFactory, but is work in progress. | |
6056 | |
6057 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed | |
6058 index errors and added methods to dump as graphviz graph. | |
6059 | |
6060 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
6061 | |
6062 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
6063 Improved the validation of WQ values. | |
6064 | |
6065 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Use the | |
6066 correct input data object to determine the selected WQ mode (range or | |
6067 single input). | |
6068 | |
6069 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
6070 | |
6071 ISSUE-40 (part I/II) | |
6072 | |
6073 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
6074 Write default values (values already selected by the user before) of the | |
6075 input data items into DESCRIBE. | |
6076 | |
6077 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
6078 | |
6079 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
6080 Removed needless imports. | |
6081 | |
6082 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
6083 | |
6084 ISSUE-85 (part III/III) | |
6085 | |
6086 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
6087 Added a static function that returns the kilometer values (double[]) | |
6088 from locations input (whitespace separated double values). | |
6089 | |
6090 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted | |
6091 the getKms() method. It will now return a computed array of kilometers | |
6092 if we had inserted a range, or it will return the inserted kilometers if | |
6093 we had inserted locations. | |
6094 | |
6095 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6096 | |
6097 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
6098 Moved cache key to separate class. | |
6099 | |
6100 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: | |
6101 New. The new cache key class. | |
6102 | |
6103 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6104 | |
6105 * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: | |
6106 Model to store the q values of a WST column efficiently. First | |
6107 building block not to store the q values directly aside the | |
6108 w values. | |
6109 | |
6110 2011-05-24 Ingo Weinzierl <ingo@intevation.de> | |
6111 | |
6112 ISSUE-85 (part I/III) | |
6113 | |
6114 * doc/conf/artifacts/winfo.xml: Added two further field 'ld_mode' and | |
6115 'ld_locations' to the range/locations state to track the selected mode | |
6116 and locations. | |
6117 | |
6118 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
6119 Added methods to validate the user inserted locations. | |
6120 | |
6121 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
6122 method to determine of a range or locations have been inserted. | |
6123 | |
6124 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
6125 | |
6126 ISSUE-62 (part II/II) | |
6127 | |
6128 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Dump the | |
6129 artifacts state/data in DEBUG mode in describe(). | |
6130 | |
6131 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
6132 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, | |
6133 src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
6134 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
6135 src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, | |
6136 src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, | |
6137 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
6138 States will no longer store data. The only reason for states storing | |
6139 StateData is to know about the necessary data for this state. If a State | |
6140 needs to access the user input for a specific StateData object, it needs | |
6141 to query the FLYSArtifact which stores the data. | |
6142 | |
6143 2011-05-23 Ingo Weinzierl <ingo@intevation.de> | |
6144 | |
6145 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
6146 method to dump the artifacts state(s)/data. | |
6147 | |
6148 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6149 | |
6150 flys/issue84 | |
6151 | |
6152 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
6153 Forget to select wst kind. | |
6154 | |
6155 2011-05-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6156 | |
6157 flys/issue81 | |
6158 | |
6159 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6160 weights for kms were swapped. | |
6161 | |
6162 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
6163 | |
6164 Tagged RELEASE 2.3.1 | |
6165 | |
6166 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
6167 | |
6168 * Changes: Prepared changes for the upcoming release. | |
6169 | |
6170 2011-05-20 Hans Plum <hans@intevation.de> | |
6171 | |
6172 * NEWS: | |
6173 Hint to Release 2.3.1. For further information look into module | |
6174 flys-client/NEWS | |
6175 | |
6176 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6177 | |
6178 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java (getExplodedValues): | |
6179 Increment kms array size by one to take the end of range, too. | |
6180 | |
6181 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6182 | |
6183 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
6184 Sort by rows (should not be necessary). | |
6185 | |
6186 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6187 Use unsharp km lookup (epsilon = 0.0001). This fixes the problem | |
6188 that some kms were not found. | |
6189 | |
6190 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
6191 | |
6192 flys/issue66 | |
6193 | |
6194 * src/main/resources/messages_en.properties: Fixed broken template. | |
6195 | |
6196 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
6197 | |
6198 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6199 Set the name of the computed discharge curve objects. | |
6200 | |
6201 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6202 The curves of this chart will now have names that consist of the word | |
6203 'Discharge Curve', the river name and the kilometer that has been used | |
6204 for the computation. | |
6205 | |
6206 * src/main/resources/messages.properties, | |
6207 src/main/resources/messages_de_DE.properties, | |
6208 src/main/resources/messages_en.properties, | |
6209 src/main/resources/messages_de.properties: Added i18n strings for the | |
6210 computed discharge curves. | |
6211 | |
6212 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6213 | |
6214 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6215 Added convenience method isQ() to determine if we are | |
6216 doing Q calculations. | |
6217 | |
6218 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6219 Reintroduced titles for the "W for unausgeglichene Abfluesse". | |
6220 | |
6221 2011-05-19 Ingo Weinzierl <ingo@intevation.de> | |
6222 | |
6223 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
6224 The curves will now have names that consist of the gauge name and its | |
6225 valid time range. | |
6226 | |
6227 * src/main/resources/messages.properties, | |
6228 src/main/resources/messages_de_DE.properties, | |
6229 src/main/resources/messages_en.properties, | |
6230 src/main/resources/messages_de.properties: Added i18n strings for the | |
6231 discharge curves. | |
6232 | |
6233 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6234 | |
6235 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6236 Removed dead code. | |
6237 | |
6238 2011-05-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6239 | |
6240 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6241 Use the correct method to generate kms. | |
6242 | |
6243 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
6244 Added some logging to test the map in debug mode. | |
6245 | |
6246 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6247 | |
6248 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
6249 Made getExplodedValues static. | |
6250 | |
6251 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6252 Use new logic to calculate "W für ungleichwertige Abfluesse". | |
6253 Not working, yet. | |
6254 | |
6255 * ChangeLog: Fixed former entry. | |
6256 | |
6257 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
6258 | |
6259 * doc/conf/artifacts/winfo.xml: Registered the WST export for discharge | |
6260 longitudinal sections. | |
6261 | |
6262 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Set the | |
6263 names of the discharge longitudinal section computation results. | |
6264 | |
6265 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: | |
6266 The W/Q curves in the chart will now have names. | |
6267 | |
6268 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
6269 The WstWriter is filled with column names in an own method. So, we are | |
6270 able to override this process in subclasses. | |
6271 | |
6272 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
6273 Adapted the column names for the WST export. | |
6274 | |
6275 2011-05-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6276 | |
6277 Work on flys/issue69 | |
6278 | |
6279 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6280 Use new logic to calculate "Wasserstand/Wasserspiegellage". | |
6281 Compared to desktop FLYS are the results are structurally right | |
6282 but a bit off in the positions after the decimal points. | |
6283 Maybe a result of the interpolation? Need to debug this. | |
6284 | |
6285 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
6286 | |
6287 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6288 W and Q curves will now have names based on the defined W or Q values | |
6289 for the waterlevel computation. | |
6290 | |
6291 2011-05-18 Ingo Weinzierl <ingo@intevation.de> | |
6292 | |
6293 * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: | |
6294 New. This object is used to give objects a name. | |
6295 | |
6296 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Inherit | |
6297 from NamedObject now. Because we need to display names for those objects | |
6298 in different places. | |
6299 | |
6300 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The WQKms | |
6301 objects returned by a waterlevel computation will now have names. | |
6302 | |
6303 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
6304 Insert the column names for the WSTs into the WstWriter. | |
6305 | |
6306 * src/main/java/de/intevation/flys/exports/WstWriter.java: The column | |
6307 names are written into the head of the WSTs now. | |
6308 | |
6309 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
6310 | |
6311 * src/main/java/de/intevation/flys/artifacts/model/WstLine.java: New. This | |
6312 class is used to store the W/Q values of a specific kilometer of a WST. | |
6313 | |
6314 * src/main/java/de/intevation/flys/exports/WstWriter.java: New. A writer | |
6315 that creates WSTs. | |
6316 | |
6317 TODO: The header of the WSTs is not finished. The Q descriptions are | |
6318 missing. | |
6319 | |
6320 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: | |
6321 Enabled WST exports. | |
6322 | |
6323 * doc/conf/artifacts/winfo.xml: Registered the WST export for waterlevels. | |
6324 | |
6325 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
6326 | |
6327 * src/main/java/de/intevation/flys/utils/Formatter.java: New. This class | |
6328 supports functions to retrieve formatters for specific types of data | |
6329 used in FLYS. | |
6330 | |
6331 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
6332 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
6333 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, | |
6334 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
6335 Removed the formatter declaration - the whole formatter stuff is done in | |
6336 Formatter now. | |
6337 | |
6338 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
6339 | |
6340 ISSUE-72 | |
6341 | |
6342 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
6343 Repaired broken XPath expressions to extract start and end kilometer. | |
6344 | |
6345 2011-05-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6346 | |
6347 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6348 Removed the Hibernate loading stuff. | |
6349 | |
6350 * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: | |
6351 New. The Hibernate loading. | |
6352 | |
6353 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6354 Use the WstValueTableFactory for loading now. | |
6355 | |
6356 2011-05-17 Ingo Weinzierl <ingo@intevation.de> | |
6357 | |
6358 Tagged RELEASE 0.1 aka Version 2.3.0 | |
6359 | |
6360 2011-05-16 Hans Plum <hans@intevation.de> | |
6361 | |
6362 * NEWS: | |
6363 New. Giving some user specific perspective to new functionality and | |
6364 changes. This file references releases dates only; details can be find | |
6365 in the client module at flys-client. | |
6366 | |
6367 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6368 | |
6369 First step to calculate "W fuer ungleichwertige Abfluesse" correctly. | |
6370 flys/issue55 | |
6371 | |
6372 * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: | |
6373 New. Remaps "gleichwertige" Q values to the corresponding | |
6374 "ungleichwertige" Q values depending on km. | |
6375 | |
6376 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6377 Remap the Q values "ungleichwertig" depending on the | |
6378 "gleichwertige" ones. | |
6379 | |
6380 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6381 | |
6382 First step to fix flys/issue69 | |
6383 | |
6384 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6385 New code path to implement the calculation of "Wasserstand/Wasspiegellage" | |
6386 correctly. TODO 1: Use new path in UI. TODO 2: Remove unused old code. | |
6387 | |
6388 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
6389 | |
6390 * Changes: Prepared Changes for the upcoming release 2.3 - see Changes | |
6391 file to get to know about the changes of the version numbers. | |
6392 | |
6393 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
6394 | |
6395 ISSUE-37 | |
6396 | |
6397 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: This | |
6398 state would be happy if there is a UI provider called "river_panel". | |
6399 | |
6400 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
6401 | |
6402 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new | |
6403 methods that return the requested chart size as integer array [width, | |
6404 height]. The requested size is read from the incomding request document. | |
6405 | |
6406 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The size | |
6407 of a chart is no longer static. The requested size is fetched using | |
6408 ChartGenerator.getSize(). | |
6409 | |
6410 2011-05-11 Ingo Weinzierl <ingo@intevation.de> | |
6411 | |
6412 ISSUE-52 | |
6413 | |
6414 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6415 The X-Axis of such a chart is inverted, if the head of the river is not | |
6416 at kilometer 0. This type of charts always have the head of the river at | |
6417 the left side. | |
6418 | |
6419 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6420 | |
6421 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
6422 Make incoming XML symmetric to DistanceInfoService. | |
6423 | |
6424 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6425 | |
6426 ISSUE-47 | |
6427 | |
6428 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, | |
6429 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
6430 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6431 Adjusted temporarily the color of the W, Q and corrected W curves to | |
6432 distinguish each other. | |
6433 | |
6434 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6435 | |
6436 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6437 Adjusted the plot of xy charts - the gridlines are displayed now. | |
6438 | |
6439 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6440 | |
6441 ISSUE-53 | |
6442 | |
6443 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
6444 Added a method that returns the preferred locale based on the available | |
6445 locales of the server and the desired locales of the request (CallMeta). | |
6446 | |
6447 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a | |
6448 method that creates a number formatter with minimum and maximum digits. | |
6449 | |
6450 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
6451 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
6452 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
6453 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
6454 Formatted the number values of the CSV exports. | |
6455 | |
6456 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6457 | |
6458 * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: | |
6459 New. A data structure that enables us to save a data triple: a range | |
6460 that consist of lower and upper double value and a set of values that | |
6461 belong to this range. | |
6462 | |
6463 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
6464 Implemented the validation of W/Q values. | |
6465 | |
6466 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6467 | |
6468 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New | |
6469 method to retrieve i18n messages based on keys. | |
6470 | |
6471 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, | |
6472 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, | |
6473 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, | |
6474 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
6475 Added headers for CSV exports. | |
6476 | |
6477 * src/main/resources/messages.properties, | |
6478 src/main/resources/messages_de_DE.properties, | |
6479 src/main/resources/messages_en.properties, | |
6480 src/main/resources/messages_de.properties: Added new i18n strings for | |
6481 CSV headers. | |
6482 | |
6483 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6484 | |
6485 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
6486 Fetches river name from incoming XML document. If no river is given all | |
6487 infos about all rivers are listed. | |
6488 | |
6489 * src/main/resources/metadata/template.xml: Templates honors the 'river' | |
6490 parameter. | |
6491 | |
6492 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
6493 Extended to pass parameters to the templating. Added support for | |
6494 type conversion. | |
6495 | |
6496 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
6497 Take parameters as an initial stack frame. | |
6498 | |
6499 * src/main/java/de/intevation/flys/artifacts/services/meta/TypeConverter.java: | |
6500 New. Converts types off stacked variables. | |
6501 | |
6502 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6503 | |
6504 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a | |
6505 method to add subtitles to charts. The implementation in this class does | |
6506 not add any subtitle. Concrete subclasses may override this method to | |
6507 add some. | |
6508 | |
6509 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
6510 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6511 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6512 Add subtitles to charts. | |
6513 | |
6514 * src/main/resources/messages.properties, | |
6515 src/main/resources/messages_de_DE.properties, | |
6516 src/main/resources/messages_en.properties, | |
6517 src/main/resources/messages_de.properties: Added i18n templates for | |
6518 compound messages (chart subtitles). | |
6519 | |
6520 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6521 | |
6522 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
6523 Added new methods to retrieve translated compound messages. | |
6524 | |
6525 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6526 | |
6527 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a | |
6528 method to set the master artifact that should be used for some special | |
6529 operations. | |
6530 | |
6531 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
6532 src/main/java/de/intevation/flys/exports/AbstractExporter.java: | |
6533 Implement the setMasterArtifact() method of the interface. | |
6534 | |
6535 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6536 Call OutGenerator.setMasterArtifact(). | |
6537 | |
6538 NOTE: The determination of the master artifact needs to be implemented! | |
6539 | |
6540 2011-05-10 Ingo Weinzierl <ingo@intevation.de> | |
6541 | |
6542 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed | |
6543 hard coded dev code that defined a WQ mode. | |
6544 | |
6545 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6546 | |
6547 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
6548 Stripped ugly extra whitespace from output introduced by | |
6549 templating. | |
6550 | |
6551 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6552 | |
6553 * src/main/resources/metadata/template.xml: Added forgotten | |
6554 columns of fixation WSTs. | |
6555 | |
6556 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
6557 | |
6558 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a | |
6559 method to retrieve i18n strings. | |
6560 | |
6561 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, | |
6562 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, | |
6563 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6564 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6565 Enabled i18n support for chart title and axes labels. | |
6566 | |
6567 * src/main/resources/messages.properties, | |
6568 src/main/resources/messages_de_DE.properties, | |
6569 src/main/resources/messages_en.properties, | |
6570 src/main/resources/messages_de.properties: Added i18n strings for the | |
6571 chart types above. | |
6572 | |
6573 2011-05-09 Ingo Weinzierl <ingo@intevation.de> | |
6574 | |
6575 * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: | |
6576 New. This OutGenerator exports the data of a discharge longitudinal | |
6577 section computation. | |
6578 | |
6579 * doc/conf/conf.xml: Added the DischargeLongitudinalSectionExporter. | |
6580 | |
6581 * doc/conf/artifacts/winfo.xml: Added the exporter with CSV facet to the | |
6582 discharge_longitudinal_section state. | |
6583 | |
6584 2011-05-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6585 | |
6586 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
6587 Added code to make back jump correction work with both | |
6588 potential flow directions. | |
6589 | |
6590 2011-05-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6591 | |
6592 * src/main/resources/metadata/template.xml: | |
6593 Added data cage configuration for 'Längsschnitt'. | |
6594 | |
6595 2011-05-06 Ingo Weinzierl <ingo@intevation.de> | |
6596 | |
6597 * doc/conf/artifacts/winfo.xml: Added the missing Q facet for discharge | |
6598 longitudinal sections. | |
6599 | |
6600 * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: New. A | |
6601 derived dataset to store W/Q values with corrected Ws for a kilometer | |
6602 range. | |
6603 | |
6604 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Some new | |
6605 methods and a new constructor to initialize this data object with a | |
6606 predefined set of values. | |
6607 | |
6608 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
6609 methods to retrieve the W/Q values for the 'discharge longitudinal | |
6610 section' computation. | |
6611 | |
6612 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: New | |
6613 methods to retrieve and compute data used for the 'discharge | |
6614 longitudinal section' computation. | |
6615 | |
6616 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
6617 | |
6618 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: | |
6619 Bugfix: just write the ranges of gauges into the DESCRIBE if the | |
6620 'wq_values' data item is required. | |
6621 | |
6622 * src/main/resources/messages.properties, | |
6623 src/main/resources/messages_de_DE.properties, | |
6624 src/main/resources/messages_en.properties, | |
6625 src/main/resources/messages_de.properties: Added i18n messages used in | |
6626 the DESCRIBE of the WQAdapted state. | |
6627 | |
6628 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
6629 | |
6630 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6631 Changed the title of the y-axis (now 'W [NN+m]'). | |
6632 | |
6633 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
6634 | |
6635 * doc/conf/artifacts/winfo.xml: Improved the transition model to reach the | |
6636 output state for creating 'discharge longitudinal section' charts. | |
6637 | |
6638 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a | |
6639 method that returns all gauges of the selected river based on a the | |
6640 given kilometer range. | |
6641 | |
6642 * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: New. | |
6643 This state creates a set of elements for the DESCRIBE that consist of a | |
6644 tuple of kilometer values. The number of elements depend on the number | |
6645 of gauges intersected by the given kilometer range. | |
6646 | |
6647 * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: | |
6648 New. This state is the output state that is reached after the 'discharge | |
6649 longitudinal section' computation has been chosen. | |
6650 | |
6651 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
6652 | |
6653 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Default | |
6654 step width between two kilometers added - if no step width is given, | |
6655 this default width is used. | |
6656 | |
6657 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
6658 | |
6659 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6660 Fixed a potential NullPointerException if there is just a single | |
6661 kilometer given to create a longitudinal section. | |
6662 | |
6663 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6664 | |
6665 * pom.xml: Added http://repository.jboss.org/maven2 repo | |
6666 to fix flys/issue30 | |
6667 | |
6668 2011-05-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6669 | |
6670 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6671 To make diagram generation possible ws are now generated from qs | |
6672 because they are many ws having different qs. | |
6673 | |
6674 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
6675 | |
6676 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
6677 Fetch the WQ data from WINFO artifact and write those values into the | |
6678 CSV export. | |
6679 | |
6680 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
6681 | |
6682 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
6683 methods to compute and retrieve the data for discharge curves (computed). | |
6684 | |
6685 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6686 Fetch the computed discharge curve data from WINFOArtifact and add the | |
6687 values into the JFreeChart dataset. | |
6688 | |
6689 2011-05-04 Ingo Weinzierl <ingo@intevation.de> | |
6690 | |
6691 * doc/conf/artifacts/winfo.xml: Added new transitions and states to enable | |
6692 the WINFO artifact for computing discharge curves. | |
6693 | |
6694 * doc/conf/conf.xml: Added OutGenerators that generate computed discharge | |
6695 curves and exports for its data. | |
6696 | |
6697 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: | |
6698 New. This state is reached if the user chose the computed discharge | |
6699 curve. | |
6700 | |
6701 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: | |
6702 New. This is only a stub implementation at the moment. This | |
6703 OutGenerator should create computed discharge curves later. It extends | |
6704 the DischargeCurveGenerator which should do the same stuff for discharge | |
6705 curves for gauges. | |
6706 | |
6707 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: | |
6708 New. This is only a stub implementation at the moment. This OutGenerator | |
6709 should create the exports of the discharge curve computation. | |
6710 | |
6711 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6712 | |
6713 * doc/conf/artifacts/winfo.xml: Added a new output mode for the duration | |
6714 curve state (CSV export). | |
6715 | |
6716 * doc/conf/conf.xml: Added a new OutGenerator to export duration curve | |
6717 computations. | |
6718 | |
6719 * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New. | |
6720 This abstract OutGenerator represents the base class for exporting | |
6721 computed data. Currently, the CSV export is supported. | |
6722 | |
6723 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Moved | |
6724 the most code to export to CSV into the AbstractExporter. | |
6725 | |
6726 * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: | |
6727 New. This exporter exports the computed data of a duration computation. | |
6728 | |
6729 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6730 | |
6731 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6732 Modified a wrong debug statement which would confuse the user. | |
6733 | |
6734 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6735 | |
6736 * doc/conf/artifacts/winfo.xml: Added a new output mode for the waterlevel | |
6737 state (CSV export). | |
6738 | |
6739 * doc/conf/conf.xml: Added a new OutGenerator to export waterlevels. | |
6740 | |
6741 * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: New. | |
6742 This OutGenerator exports the data of a waterlevel computation. Note: | |
6743 It is necessary to specify the desired facet (e.g. | |
6744 'waterlevel_export.csv'). | |
6745 | |
6746 * pom.xml: Added a dependency to OpenCSV. | |
6747 | |
6748 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6749 | |
6750 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6751 Introduced an "export" output target. If the target is "export", a | |
6752 facet (read from the incoming xml document) is a necessary parameter | |
6753 that determines which facets are written to the output. | |
6754 | |
6755 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6756 | |
6757 * src/main/resources/messages_en.properties: Bugfix: replaced german | |
6758 string (copy & paste mistake). | |
6759 | |
6760 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6761 | |
6762 * src/main/resources/messages.properties, | |
6763 src/main/resources/messages_de_DE.properties, | |
6764 src/main/resources/messages_en.properties, | |
6765 src/main/resources/messages_de.properties: Added new i18n strings for | |
6766 for the location selection. | |
6767 | |
6768 2011-05-03 Ingo Weinzierl <ingo@intevation.de> | |
6769 | |
6770 * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: | |
6771 New. An OutGenerator for creating duration curves. | |
6772 | |
6773 * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: New. A | |
6774 model class to store necessary data for creating W and Q facets of a | |
6775 duration curve. This model stores W, Q and Days. | |
6776 | |
6777 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
6778 Added a function to retrieve tuples of (day, q) based on a given gauge - | |
6779 these tuples are necessary for creating duration curves. | |
6780 | |
6781 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
6782 methods to compute and retrieve the data necessary for creating duration | |
6783 curves. | |
6784 | |
6785 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
6786 Bugfix: improved the access to the location array (avoid | |
6787 NullPointerException). | |
6788 | |
6789 * doc/conf/conf.xml: Registered the new OutGenerator for duration curves. | |
6790 | |
6791 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6792 | |
6793 * contrib/visualize-transitions.xsl: State quoting was done wrong. | |
6794 | |
6795 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6796 | |
6797 * doc/conf/artifacts/winfo.xml: Enhanced the transition model to reach the | |
6798 final state for creating duration curves. | |
6799 | |
6800 * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: | |
6801 New. This state should be reached to just insert an array of locations. | |
6802 | |
6803 * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: | |
6804 New. This state is reached if the duration curve calculation is | |
6805 selected. | |
6806 | |
6807 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adjusted | |
6808 getDistance() so that it takes care on inserted locations - not just | |
6809 inserted ranges. | |
6810 | |
6811 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6812 | |
6813 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
6814 Flush/persist caches at program exists. | |
6815 | |
6816 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6817 Commented out too eloquent debug output. | |
6818 | |
6819 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6820 | |
6821 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
6822 Uses the methods of FLYSArtifact to retrieve the necessary information | |
6823 rivername and selected distance. | |
6824 | |
6825 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6826 | |
6827 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6828 Added interpolateW method to take reference to result ws array | |
6829 as an argument to avoid expensive array allocations in km iterating | |
6830 loops. | |
6831 | |
6832 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
6833 Added a constructor to create backing trove datastructure | |
6834 with the right capacity. | |
6835 | |
6836 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
6837 Move allocation of result ws out of km loop. | |
6838 | |
6839 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6840 | |
6841 * doc/conf/artifacts/winfo.xml: Added two further data items in the WQ | |
6842 selection state. Those items are necessary to store the information | |
6843 about the selected mode (range/single selection) and the values of the | |
6844 single selection. | |
6845 | |
6846 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: If | |
6847 there is no value for a data item, this item is not written into the | |
6848 static DESCRIBE part. | |
6849 | |
6850 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java, | |
6851 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
6852 Renamed the method to validate upper and lower values. | |
6853 | |
6854 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This | |
6855 state can now handle values inserted in the single selection. Therefore, | |
6856 new validate methods has been added. | |
6857 | |
6858 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
6859 methods getWs() and getWs() take care on the values inserted in the | |
6860 single insert mode of the client which enables the user to insert single | |
6861 W and Q. | |
6862 | |
6863 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6864 | |
6865 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
6866 Repaired getQForW() by calculating indices on right dimension. | |
6867 | |
6868 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6869 | |
6870 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New | |
6871 methods for retrieving selected W values (getWs()). | |
6872 | |
6873 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
6874 method for retrieving waterlevel data takes care on selected Ws, now. | |
6875 The selected Ws are transformed using the DischargeTables.getQForW() | |
6876 into Q values. | |
6877 | |
6878 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6879 | |
6880 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
6881 Removed an unused parameter 'result' of getQForW(). | |
6882 | |
6883 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
6884 | |
6885 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Removed | |
6886 the getDataset() method and replaced it with a addDataset() method. | |
6887 On this way, concrete subclasses of this OutGenerator can have multiple | |
6888 datasets (e.g. different datasets for W and Q). This abstract method is | |
6889 called after the chart generation is finished. | |
6890 | |
6891 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
6892 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
6893 Both classes implement the addDataset() method. The | |
6894 LongitudinalSectionGenerator has already multiple datasets for W and Q. | |
6895 Both are added to the chart - both have an own range axis. | |
6896 | |
6897 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6898 | |
6899 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
6900 Use the cache for the wst value table if configured. | |
6901 | |
6902 * doc/conf/cache.xml: Choose a more precise name for the | |
6903 wst value table cache. | |
6904 | |
6905 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6906 | |
6907 * pom.xml: Added dependency to Ehcache. Apache 2.0 license. | |
6908 | |
6909 * doc/conf/conf.xml: Added configuration of ehcache. | |
6910 | |
6911 * doc/conf/cache.xml: New. Cache configurations. | |
6912 | |
6913 * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: | |
6914 New. Factory to access caches. | |
6915 | |
6916 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6917 | |
6918 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
6919 Forgot to add. | |
6920 | |
6921 * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: | |
6922 New. Given a database connection and a XML template it generates | |
6923 an output with meta data about the database. | |
6924 | |
6925 * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: | |
6926 New. Holds prepared statements optimized to be run in the stack of | |
6927 contextes. | |
6928 | |
6929 * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: | |
6930 New. Model to hold a hierarchical scope of variables. | |
6931 | |
6932 * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: | |
6933 New. Stores data set fetched from a sql select to be iterated in | |
6934 a context. | |
6935 | |
6936 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, | |
6937 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6938 Removed superfluous imports. | |
6939 | |
6940 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6941 | |
6942 * doc/conf/conf.xml: Added meta data service. | |
6943 | |
6944 * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: | |
6945 Stub for the meta data service. | |
6946 | |
6947 * src/main/resources/metadata/template.xml: Initial template for | |
6948 the meta data service. | |
6949 | |
6950 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6951 | |
6952 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
6953 Bugfix: Now, curves for Q values are drawn into a longitudinal section | |
6954 chart as well. Therefore, it was necessary to change the datastructure | |
6955 of the inner class ThemeList that stores all themes included in a chart | |
6956 in an ordered list (stored in a java.util.Vector now). | |
6957 | |
6958 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6959 | |
6960 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: New. An | |
6961 abstract base class for ChartGenerators that create XY charts. | |
6962 | |
6963 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
6964 Sourced the generate() method out to the XYChartGenerator. | |
6965 | |
6966 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
6967 Implemented the methods to add W and Q facets to the chart. | |
6968 | |
6969 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6970 | |
6971 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Improved | |
6972 the calculation of the step with for ranges. | |
6973 | |
6974 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6975 | |
6976 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Added a | |
6977 method that returns the number of elements stored in the data pool. | |
6978 | |
6979 2011-04-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
6980 | |
6981 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: | |
6982 Added a get() method which takes destination array as an | |
6983 argument. | |
6984 | |
6985 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6986 | |
6987 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Changed the | |
6988 data structure to store w, q and kms values from List<Double> to | |
6989 TDoubleArrayList which stores native double values instead of big | |
6990 Double values. | |
6991 | |
6992 * pom.xml: Added the GNU Trove dependency. | |
6993 | |
6994 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
6995 | |
6996 * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added the | |
6997 name a the requested facet to doOut(). Concrete generators should just | |
6998 create output for this facet now. | |
6999 | |
7000 * src/main/java/de/intevation/flys/exports/ChartGenerator.java, | |
7001 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, | |
7002 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
7003 Adapted the method signature of doOut(). | |
7004 | |
7005 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7006 Adapted the method call of OutGenerator.doOut(). | |
7007 | |
7008 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
7009 | |
7010 * doc/conf/themes.xml: Added mappings for the facets | |
7011 longitudinal.section.w and longitudinal.section.q. | |
7012 | |
7013 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
7014 | |
7015 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added some | |
7016 methods to retrieve necessary information for computing the data of a | |
7017 waterlevel. | |
7018 | |
7019 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
7020 methods to compute and retrieve the data of a waterlevel computation. | |
7021 | |
7022 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
7023 | |
7024 * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: New. This | |
7025 model class represents a pool of data triples that consist of W, Q and | |
7026 Kms information. This class might be used to compute data for creating | |
7027 longitudinal section curves (which are based on those W, Q and Kms | |
7028 values). | |
7029 | |
7030 2011-04-29 Ingo Weinzierl <ingo@intevation.de> | |
7031 | |
7032 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7033 Bugfix: Removed endless loop and a bug while iterating over Hibernate | |
7034 results. | |
7035 | |
7036 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7037 | |
7038 * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: | |
7039 New. An OutGenerator that creates longitudinal section curves. | |
7040 | |
7041 NOTE: This is just the stub - the out creation needs to be implemented! | |
7042 | |
7043 * doc/conf/conf.xml: Added the LongitudinalSectionGenerator. | |
7044 | |
7045 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7046 | |
7047 * doc/conf/conf.xml: Bugfix: Added missing <output-generators> section. | |
7048 | |
7049 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7050 | |
7051 * src/main/java/de/intevation/flys/artifacts/WaterlevelState.java: New. | |
7052 This state should be reached if the 'calc.surface.curve' calculation | |
7053 method has been chosen. | |
7054 | |
7055 * doc/conf/artifacts/winfo.xml: Modified a transition and added the | |
7056 WaterlevelState. This state is reached if the 'calc.surface.curve' | |
7057 calculation method has been chosen. It currently has 1 output - a | |
7058 longitudinal section that is not implemented yet! | |
7059 | |
7060 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7061 | |
7062 * src/main/java/de/intevation/flys/artifacts/transitions/ValueCompareTransition.java: | |
7063 New. This transition is valid if the a data object of the current | |
7064 artifact equals/notequals a configured value in the transition model. | |
7065 | |
7066 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7067 | |
7068 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
7069 src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Bugfixes: | |
7070 - Adapted the parameters of the isStateReachable() call - added the | |
7071 artifact and the current state. | |
7072 - Append the outputs of a current state if the state is filled with | |
7073 valid data. | |
7074 | |
7075 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7076 | |
7077 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
7078 Added the missing init() method that has been introduced in the | |
7079 interface some commits ealier. | |
7080 | |
7081 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
7082 Call init() after a Transition has been created. | |
7083 | |
7084 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7085 | |
7086 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
7087 Bugfix: Introduced a <art:outputs> node in the attribute document of a | |
7088 Collection that contains further <art:output> nodes - instead of having | |
7089 multiple <art:output> nodes at toplevel of the document. | |
7090 | |
7091 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7092 Adapted the XPath to retrieve the outputs in the attribute document of a | |
7093 Collection. | |
7094 | |
7095 2011-04-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7096 | |
7097 * contrib/visualize-transitions.xsl: Added to create a | |
7098 Graphviz digraph out of the config.xml. Usage: | |
7099 | |
7100 $ xsltproc --stringparam base-dir ../doc/conf/ \ | |
7101 contrib/visualize-transitions.xsl \ | |
7102 doc/conf/conf.xml > transitions.dot | |
7103 | |
7104 $ dot -Tsvg -o transitions.svg transitions.dot | |
7105 | |
7106 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7107 | |
7108 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
7109 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
7110 If no data has been inserted so far, an IllegalArgumentException is | |
7111 thrown. | |
7112 | |
7113 2011-04-28 Ingo Weinzierl <ingo@intevation.de> | |
7114 | |
7115 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:: | |
7116 A lot of new methods to retrieve the theme of a facet - used while | |
7117 creating the output of a facet/artifact. If a facet has no theme yet, it | |
7118 is initialized. | |
7119 | |
7120 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
7121 | |
7122 * src/main/java/de/intevation/flys/collections/AttributeParser.java, | |
7123 src/main/java/de/intevation/flys/collections/OutputParser.java: Removed | |
7124 useless imports. | |
7125 | |
7126 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
7127 | |
7128 * src/main/java/de/intevation/flys/exports/ChartGenerator.java: New. An | |
7129 abstract OutGenerator that might be used to create chart output. Some | |
7130 basic things that are equal in all charts should be done here! | |
7131 | |
7132 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
7133 This OutGenerator no longer implements the OutGenerator directly, but it | |
7134 extends the ChartGenerator now. | |
7135 | |
7136 2011-04-27 Ingo Weinzierl <ingo@intevation.de> | |
7137 | |
7138 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7139 Restructured the out() operation of a collection: Now, we collect a list | |
7140 of artifacts/facets and use this for the OutGenerator. Its doOut() | |
7141 method gets the attribute of an artifact - the position and the active | |
7142 state is managed by the Collection itself. | |
7143 | |
7144 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
7145 | |
7146 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: New. | |
7147 a specialized facet that stores information about its position and its | |
7148 state (active/inactive) in an output of a collection. | |
7149 | |
7150 * src/main/java/de/intevation/flys/collections/AttributeParser.java: New. | |
7151 This parser takes the attributes (XML) of a collection and extracts the | |
7152 contained outputs with its facets. The result is a Map<String, Output>. | |
7153 | |
7154 * src/main/java/de/intevation/flys/collections/OutputParser.java: New. | |
7155 This parser is used to query the artifact's DESCRIBE and to extract the | |
7156 supported outputs. The result is a Map<String, Output>. | |
7157 | |
7158 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: New. | |
7159 This writer merges the outputs contained in an attribute of a collection | |
7160 with the outputs of a collection's artifacts. | |
7161 | |
7162 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7163 The attributes of a collection are written into its DESCRIBE document | |
7164 now. The OutputParser and AttributeParser are used to read the supported | |
7165 attributes by the collection and its artifacts - the AttributeWriter is | |
7166 used to merge both attributes and create a final attribute document. | |
7167 | |
7168 2011-04-26 Ingo Weinzierl <ingo@intevation.de> | |
7169 | |
7170 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java, | |
7171 src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
7172 The facet-2-theme mappings are initialized at startup and stored in the | |
7173 FLYSContext. | |
7174 | |
7175 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Added a | |
7176 function that retrieves a theme from FLYSContext based on its name. | |
7177 | |
7178 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7179 | |
7180 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7181 Corrected a silly c&p mistake. | |
7182 | |
7183 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7184 | |
7185 * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: | |
7186 | |
7187 Implementation of the "Ruecksprungkorrektur" to be done in | |
7188 "W fuer angepassten Abflusslaengschnitt". | |
7189 | |
7190 All tests show the expected results. In some corner cases the | |
7191 algorithm described in the "Anwenderhandbuch" chapter 3.3.4.3 "Korrektur" | |
7192 has some definition shortcomings: | |
7193 | |
7194 a - What should happend when you cannot find point 2 because | |
7195 you cannot step back one quarter from point 3 because there | |
7196 is no data there any more (river too short in this direction)? | |
7197 The implemented algorithm raises point 3' only to an | |
7198 according factor. E.g. If you can step back the whole quarter | |
7199 distance the elevation is the full quarter. If you can | |
7200 step back only the half of the quarter the elevation is | |
7201 only an eighth. | |
7202 | |
7203 b - If the water heights between point 2 and 3 are constant then | |
7204 the algorithm will produce a spline interpolation that | |
7205 lowers those values. Is this intended? | |
7206 | |
7207 For real data the back jumps are expected to be more in the middle | |
7208 of the distance ranges so the corner cases are maybe not so | |
7209 important. | |
7210 | |
7211 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7212 Removed superfluous import. | |
7213 | |
7214 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
7215 | |
7216 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Removed debug | |
7217 code that has been commited by accident. | |
7218 | |
7219 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
7220 | |
7221 * doc/conf/themes.xml: New. A first small theme configuration. | |
7222 | |
7223 * doc/conf/conf.xml: Added a link to the theme configuration. | |
7224 | |
7225 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
7226 Defined a key that is used to store a themes map in the FLYSContext. | |
7227 | |
7228 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
7229 The theme configuration is read at startup and the themes are stores in | |
7230 the FLYSContext. | |
7231 | |
7232 2011-04-21 Ingo Weinzierl <ingo@intevation.de> | |
7233 | |
7234 * src/main/java/de/intevation/flys/themes/Theme.java, | |
7235 src/main/java/de/intevation/flys/themes/DefaultTheme.java: | |
7236 New. The interface and its default implementation that represents themes | |
7237 used to style charts and maps. | |
7238 | |
7239 * src/main/java/de/intevation/flys/themes/ThemeField.java, | |
7240 src/main/java/de/intevation/flys/themes/DefaultThemeField.java: | |
7241 New. The interface and its default implementation that represents fields | |
7242 in themes. A theme might be "Lines" and one of its field might be | |
7243 "Color" or "Size". | |
7244 | |
7245 * src/main/java/de/intevation/flys/themes/ThemeFactory.java: A factory | |
7246 that creates new themes based on a theme configuration. | |
7247 | |
7248 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7249 | |
7250 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7251 Implementation of "Abflusskurve/Abflusstafel" calculation. | |
7252 | |
7253 Added method interpolateWQ() which takes an km and results in a | |
7254 tuple of two double arrays containing the w/q values interpolated | |
7255 between the surrounding w/q values of the table. | |
7256 w values are interpolated linear, q values with a cubic spline. | |
7257 | |
7258 Drawing w over q gives you the discharge table at the given km. | |
7259 | |
7260 !!! This code needs testing !!! | |
7261 | |
7262 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7263 | |
7264 * pom.xml: Added dependency to Apache Commons Math 2.2 (Apache License 2.0) | |
7265 | |
7266 2011-04-20 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7267 | |
7268 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7269 Fix problem when sorting by q (copied w instead of q). | |
7270 | |
7271 2011-04-20 Ingo Weinzierl <ingo@intevation.de> | |
7272 | |
7273 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7274 Fixed broken HQL statement. | |
7275 | |
7276 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7277 | |
7278 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7279 add a method interpolateW() which takes an array of | |
7280 q values and returns an equal sized array of w values. | |
7281 This is essentially the "Wasserstand/Wasserspiegellagen" calculation | |
7282 of desktop FLYS. | |
7283 | |
7284 If you want to do a calculation with given w values you have | |
7285 to convert the w values with DischargeTables.getQForW() first. | |
7286 | |
7287 !!! This code needs heavy testing !!! | |
7288 | |
7289 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7290 | |
7291 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7292 We need a getQForW() method and not getWForQ() because when | |
7293 doing a "Wasserstand/Wasserspiegellagen" calculation with given | |
7294 w values these values need to be translated to q values with | |
7295 the master discharge table. | |
7296 | |
7297 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7298 | |
7299 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7300 Sorting of q values was done wrong. | |
7301 | |
7302 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
7303 | |
7304 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
7305 Ordered the list of annotations returned by this factory based on its | |
7306 range. | |
7307 | |
7308 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
7309 | |
7310 * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: | |
7311 New. This service returns an XML document that includes the main values | |
7312 of a gauge based on a river name, a start and an end point. | |
7313 | |
7314 * doc/conf/conf.xml: Registered the MainValuesService. | |
7315 | |
7316 2011-04-19 Ingo Weinzierl <ingo@intevation.de> | |
7317 | |
7318 * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: | |
7319 A factory that provides methods to return MainValues. | |
7320 | |
7321 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7322 | |
7323 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7324 Added static method getWForQ() to interpolate a w value for | |
7325 a given q value based on a given discharge table. | |
7326 | |
7327 2011-04-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7328 | |
7329 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7330 Added convenience constructors/methods to ease the access to the master | |
7331 discharge table of a gauge. | |
7332 | |
7333 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7334 | |
7335 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7336 Moved the query complexity into view 'wst_value_table' and | |
7337 used this instead. | |
7338 | |
7339 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7340 | |
7341 * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: | |
7342 Fetches w/q value tables from the backend. TODO: Move this | |
7343 to the backend and use a view. | |
7344 | |
7345 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7346 | |
7347 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
7348 the error key that is thrown if no input data was found so that the key | |
7349 is usable for GWT's i18n mechanism. | |
7350 | |
7351 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7352 | |
7353 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7354 The inserted river is validated now (overrides validate() of | |
7355 DefaultState). | |
7356 | |
7357 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7358 | |
7359 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7360 The inserted calculation method is validated now (overrides validate() | |
7361 of DefaultState). | |
7362 | |
7363 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7364 | |
7365 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
7366 The input data of feed() are validated using the DefaultStates | |
7367 validate() method. | |
7368 | |
7369 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7370 New method validate() that needs to be overidden by concrete subclasses. | |
7371 It should return true, if the data of the State is fine, otherwise it | |
7372 should raise an exception. | |
7373 | |
7374 NOTE: The exceptions are not translated in the server but in the client! | |
7375 | |
7376 * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: New. | |
7377 This abstract class exists to provide some methods for handling ranges. | |
7378 Currently, there is a method that validates a given range based on | |
7379 min/max values. | |
7380 | |
7381 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, | |
7382 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
7383 Implemented input data validation for ranges. | |
7384 | |
7385 NOTE: The input validation of concrete values has not been implemented | |
7386 yet! | |
7387 | |
7388 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7389 | |
7390 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
7391 Removed debug code that has been commited by accident :-/ | |
7392 | |
7393 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
7394 | |
7395 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
7396 getGauge() method returns the first gauge based on the given start and | |
7397 end point of the river. | |
7398 | |
7399 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
7400 Fixed potential bugs: if no gauge could be determined, the default | |
7401 values for W and Q are the minimum and maximum double values. | |
7402 | |
7403 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
7404 | |
7405 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fills | |
7406 the DESCRIBE with default values for W and Q. | |
7407 | |
7408 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
7409 | |
7410 * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: | |
7411 New. Returns Wst object - based on a river. | |
7412 | |
7413 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
7414 | |
7415 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Now | |
7416 provides some methods that return some basic objects inserted while | |
7417 parameterization: River, Gauge and so on. | |
7418 | |
7419 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
7420 | |
7421 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
7422 src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7423 Bugfix: Repaired broken imports of the SessionHolder. | |
7424 | |
7425 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
7426 | |
7427 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
7428 Moved this class to flys-backend. | |
7429 | |
7430 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
7431 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
7432 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
7433 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, | |
7434 src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
7435 Adapted imports of the SessionHolder. | |
7436 | |
7437 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7438 | |
7439 * trunk/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, | |
7440 trunk/src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7441 Acquire/release sessions in services to avoid db connection leaks. | |
7442 | |
7443 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7444 | |
7445 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7446 Changed some method signatures - added a reference to the owner | |
7447 Artifact. | |
7448 | |
7449 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
7450 src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, | |
7451 src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7452 Modified method signatures based on the changes in DefaultState. | |
7453 | |
7454 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
7455 Added default values to the dynamic part of DESCRIBE. | |
7456 | |
7457 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7458 | |
7459 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
7460 Added a function that returns a River object based on a given river | |
7461 name. | |
7462 | |
7463 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7464 | |
7465 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
7466 src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, | |
7467 src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, | |
7468 src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
7469 Static methods are using the SessionHolder, too. | |
7470 | |
7471 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7472 | |
7473 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
7474 Added the setup() method that has been added to the interface | |
7475 description in the last commits. | |
7476 | |
7477 * doc/conf/conf.xml: Registered the SessionCallContextListener as | |
7478 CallContext.Listener. | |
7479 | |
7480 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7481 | |
7482 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
7483 Bugfix: Call correct method to retrieve an instance of | |
7484 SessionFactoryProvider. | |
7485 | |
7486 2011-04-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7487 | |
7488 * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: | |
7489 New. Contains thread local session holder for hibernate sessions. | |
7490 | |
7491 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
7492 Uses session from SessionHolder. | |
7493 | |
7494 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
7495 Interacts with SessionHolder now. | |
7496 | |
7497 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
7498 Removed superfluous import. | |
7499 | |
7500 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7501 | |
7502 * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: | |
7503 Implementation of a CallContext.Listener to open/close Hibernate | |
7504 Sessions for each request. | |
7505 | |
7506 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7507 | |
7508 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
7509 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7510 Some modifications related to the last commit - modification of the | |
7511 describe() signature of a State. | |
7512 | |
7513 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
7514 | |
7515 * src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: | |
7516 Removed. We do not need a state to select a gauge - the selection takes | |
7517 place by choosing a start and an end point. | |
7518 | |
7519 2011-04-13 Ingo Weinzierl <ingo@intevation.de> | |
7520 | |
7521 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7522 Bugfix: added missing label node to root node and a namespace to the | |
7523 data node. | |
7524 | |
7525 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
7526 | |
7527 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7528 The name of the artifact 'winfo' is written into the DESCRIBE document | |
7529 now. We need this to have a proper way to distinguish between different | |
7530 artifacts in the UI. | |
7531 | |
7532 2011-04-12 Ingo Weinzierl <ingo@intevation.de> | |
7533 | |
7534 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Bugfix: | |
7535 States are filled with data before they describe themself. | |
7536 | |
7537 2011-04-11 Ingo Weinzierl <ingo@intevation.de> | |
7538 | |
7539 * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: | |
7540 New. A factory that returns the annotations of a specific river. | |
7541 | |
7542 * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: | |
7543 New. This service provides a document that contains information about | |
7544 distances of a river. | |
7545 | |
7546 * doc/conf/conf.xml: Registered the DistanceInfoService. | |
7547 | |
7548 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
7549 | |
7550 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7551 This collection overrides the out() operation now. The incoming request | |
7552 document is read and the related OutGenerator is used to create the | |
7553 output. | |
7554 | |
7555 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
7556 the code to create discharge curves. It has moved to the | |
7557 DischargeCurveGenerator which now does this work. | |
7558 | |
7559 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
7560 | |
7561 * src/main/java/de/intevation/flys/exports/OutGenerator.java: The | |
7562 generate() method throws an IOException now. | |
7563 | |
7564 * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: | |
7565 New. This OutGenerator creates discharge curves. | |
7566 | |
7567 2011-04-06 Ingo Weinzierl <ingo@intevation.de> | |
7568 | |
7569 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed | |
7570 the visibility of the getData() method. It's now public, because the | |
7571 OutGenerator needs an artifact's data. | |
7572 | |
7573 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7574 | |
7575 * src/**/*.java: Removed trailing whitespace. | |
7576 | |
7577 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7578 | |
7579 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7580 Make project compilable again by | |
7581 commenting out a not existing XMLDebug reference. | |
7582 | |
7583 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
7584 | |
7585 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
7586 Added code to parse the configured OutGenerators and to save them (in a | |
7587 map) in the FLYSContext. | |
7588 | |
7589 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: | |
7590 Added a key that is used to save the OutGenerators Map in the context. | |
7591 | |
7592 2011-03-31 Ingo Weinzierl <ingo@intevation.de> | |
7593 | |
7594 * src/main/java/de/intevation/flys/exports/OutGenerator.java: | |
7595 New. This interface is used to generator different types of output. | |
7596 ArtifactCollections will make use of this interface to create a | |
7597 collected output of all its artifacts. | |
7598 | |
7599 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
7600 | |
7601 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7602 Removed the Backend from FLYSArtifactCollection - used ArtifactDatabase | |
7603 operations instead. | |
7604 | |
7605 * TODO: Removed 'remove Backend reference' TODO. | |
7606 | |
7607 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
7608 | |
7609 * doc/conf/artifacts/winfo.xml: Enhanced the configuration of the | |
7610 discharge curve output mode. This output now provides three facets - W, | |
7611 Q and the curve itself. | |
7612 | |
7613 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
7614 | |
7615 Tagged RELEASE 0.1 | |
7616 | |
7617 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
7618 | |
7619 * doc/conf/artifacts/winfo.xml: Renamed an output mode in the WINFO | |
7620 artifact configuration. | |
7621 | |
7622 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
7623 | |
7624 * src/main/resources/messages_de_DE.properties, | |
7625 src/main/resources/messages_de.properties: Changed a german string. | |
7626 | |
7627 2011-03-29 Ingo Weinzierl <ingo@intevation.de> | |
7628 | |
7629 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7630 Modified the available calculation modes and its order in the DESCRIBE | |
7631 document. | |
7632 | |
7633 * src/main/resources/messages.properties, | |
7634 src/main/resources/messages_de_DE.properties, | |
7635 src/main/resources/messages_en.properties, | |
7636 src/main/resources/messages_de.properties: Adapted the names of | |
7637 calculation modes. | |
7638 | |
7639 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
7640 | |
7641 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7642 Added the hash code of an artifact to the artifact part of the | |
7643 collection's DESCRIBE document. | |
7644 | |
7645 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
7646 | |
7647 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Changed | |
7648 the background color of discharge curves to white. | |
7649 | |
7650 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7651 | |
7652 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7653 Cache the scale, too. Otherwise two calls to getValues() with | |
7654 different arguments will result in the same output. | |
7655 | |
7656 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
7657 | |
7658 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7659 Introduced a 'scale' parameter in the getValues() method. | |
7660 | |
7661 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Filled | |
7662 the out() operation with code that draws a discharge table of one or | |
7663 more gauges specified by the given range in entered in a previous state. | |
7664 | |
7665 2011-03-28 Ingo Weinzierl <ingo@intevation.de> | |
7666 | |
7667 * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: | |
7668 New. A helper class to exports charts. | |
7669 | |
7670 * pom.xml: Added dependencies to iText, Batik and JFreeChart. | |
7671 | |
7672 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7673 | |
7674 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
7675 Fixed swap of operands. | |
7676 | |
7677 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7678 | |
7679 * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: | |
7680 New. Load gauges for a river and filter them for given | |
7681 ranges. | |
7682 | |
7683 2011-03-25 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7684 | |
7685 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7686 Store data in a double [][] instead of interleaved double [] | |
7687 to be compatible with org.jfree.data.xy.DefaultXYDataset. | |
7688 | |
7689 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
7690 | |
7691 * TODO: Removed 'i18n' and 'step-back' TODOs and added an issue to remove | |
7692 the Backend reference from FLYSArtifactCollection. | |
7693 | |
7694 2011-03-25 Ingo Weinzierl <ingo@intevation.de> | |
7695 | |
7696 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7697 Added missing artifact namespace of an attribute in the DESCRIBE | |
7698 document. | |
7699 | |
7700 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
7701 | |
7702 * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: | |
7703 New. This ArtifactCollection overrides the DefaultArtifactCollection to | |
7704 implement FLYS specific describe() and out() operations. | |
7705 | |
7706 * doc/conf/conf.xml: Use the FLYSArtifactCollection instead of the | |
7707 DefaultArtifactCollection for this application. | |
7708 | |
7709 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7710 | |
7711 * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: | |
7712 New. Fetches values of discharge tables in form of packed | |
7713 w/q double arrays for given gauges. | |
7714 | |
7715 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
7716 Removed needless import. | |
7717 | |
7718 2011-03-24 Ingo Weinzierl <ingo@intevation.de> | |
7719 | |
7720 * src/main/resources/messages_de_DE.properties: Added a german resource | |
7721 bundle to avoid exceptions in the flys artifacts. Sometimes, the | |
7722 Resources class is not able to find a 'de_DE' bundle and throws an | |
7723 exception. This is really strange, because it should use the 'de' bundle | |
7724 in that case, but it doesn't. | |
7725 | |
7726 2011-03-23 Ingo Weinzierl <ingo@intevation.de> | |
7727 | |
7728 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added | |
7729 some code to append the output modes of previous states to the DESCRIBE | |
7730 document. | |
7731 | |
7732 TODO: Determine if the current state is already filled with data and | |
7733 append its output modes as well! | |
7734 | |
7735 2011-03-22 Ingo Weinzierl <ingo@intevation.de> | |
7736 | |
7737 * doc/conf/artifacts/winfo.xml: Enhanced the location_distance state with | |
7738 an output mode 'discharge_table'. | |
7739 | |
7740 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
7741 | |
7742 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7743 Write human readable strings as label attribute into the DESCRIBE | |
7744 output. Those labels are used to be displayed in the GUI. | |
7745 | |
7746 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
7747 | |
7748 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7749 Added some further calculation types. | |
7750 | |
7751 * src/main/resources/messages.properties, | |
7752 src/main/resources/messages_en.properties, | |
7753 src/main/resources/messages_de.properties: Added i18n strings for the | |
7754 calculation types | |
7755 | |
7756 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
7757 | |
7758 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
7759 Implemented the step-back part of the advance() operation. | |
7760 | |
7761 2011-03-21 Ingo Weinzierl <ingo@intevation.de> | |
7762 | |
7763 * src/main/resources/messages_de.properties: Fixed a german umlaut. | |
7764 | |
7765 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
7766 | |
7767 * doc/conf/artifacts/winfo.xml: Added new states for entering a | |
7768 location/distance and w/q. | |
7769 | |
7770 * src/main/resources/messages.properties, | |
7771 src/main/resources/messages_en.properties, | |
7772 src/main/resources/messages_de.properties: New string for the | |
7773 location/distance and w/q input states. | |
7774 | |
7775 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
7776 | |
7777 * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: | |
7778 New. A state for the W/Q input of the WINFO parameterization. | |
7779 | |
7780 2011-03-18 Ingo Weinzierl <ingo@intevation.de> | |
7781 | |
7782 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7783 Append an attribute 'uiprovider' to the dynamic UI node. | |
7784 | |
7785 * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: | |
7786 New. A state for the location/distance selection of the WINFO | |
7787 parameterization. | |
7788 | |
7789 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
7790 | |
7791 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7792 Added a new method getUIProvider() that might be overriden by concreted | |
7793 subclasses that should be rendered with a specific UIProvider. | |
7794 | |
7795 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
7796 | |
7797 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7798 The static UI part is created by the previous states now. This makes it | |
7799 possible to group the data objects (which is necessary to group the | |
7800 objects in the ui). | |
7801 | |
7802 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7803 Added a describeStatic() method that creates a node that contains the | |
7804 data of that state. | |
7805 | |
7806 2011-03-17 Ingo Weinzierl <ingo@intevation.de> | |
7807 | |
7808 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7809 Removed TODO: the document contains the rivers provided by the backend | |
7810 now. | |
7811 | |
7812 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7813 | |
7814 * pom.xml: Added dependency to flys backend. | |
7815 | |
7816 * src/main/java/de/intevation/flys/artifacts/model/River.java: | |
7817 Removed. We are using the backend model now. | |
7818 | |
7819 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: | |
7820 Fetches the rivers from the backend. | |
7821 | |
7822 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7823 Import fixes. | |
7824 | |
7825 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7826 | |
7827 * doc/conf/conf.xml: Added section for database backend configuration. | |
7828 | |
7829 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
7830 | |
7831 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
7832 Fixed build error coming from different import of XMLUtils. | |
7833 | |
7834 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
7835 | |
7836 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7837 Appended the missing label node that contains the human readable name of | |
7838 the data item. | |
7839 | |
7840 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
7841 | |
7842 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, | |
7843 src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7844 I18N of strings for the DESCRIBE document. | |
7845 | |
7846 * src/main/resources/messages.properties, | |
7847 src/main/resources/messages_en.properties, | |
7848 src/main/resources/messages_de.properties: I18N strings for the | |
7849 calculcation mode state. | |
7850 | |
7851 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
7852 | |
7853 * doc/conf/artifacts/winfo.xml: Modified the winfo states. | |
7854 | |
7855 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Adapted | |
7856 the artifact regarding the changes of the last commit. The states | |
7857 describe() method creates the dynamic UI node - the artifact needs to | |
7858 apply this node. | |
7859 | |
7860 * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: | |
7861 New. The state for choosing the calculation mode. | |
7862 | |
7863 * src/main/resources/messages.properties, | |
7864 src/main/resources/messages_en.properties, | |
7865 src/main/resources/messages_de.properties: Added i18n strings for the | |
7866 calculation mode state. | |
7867 | |
7868 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
7869 | |
7870 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: | |
7871 New. This is the base state for the FLYS application. It provides a | |
7872 method that creates the dynamic ui node for the DESCRIBE. | |
7873 | |
7874 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
7875 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: Both | |
7876 classes extend the abstract base class DefaultState. | |
7877 | |
7878 2011-03-14 Ingo Weinzierl <ingo@intevation.de> | |
7879 | |
7880 * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: | |
7881 New. This class retrieves the i18n strings from a ResourceBundle. | |
7882 | |
7883 * src/main/resources/messages.properties, | |
7884 src/main/resources/messages_en.properties, | |
7885 src/main/resources/messages_de.properties: Resource files for german and | |
7886 english translation. | |
7887 | |
7888 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
7889 | |
7890 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended | |
7891 the data that have been inserted in former states into the static node | |
7892 of the DESCRIBE. | |
7893 | |
7894 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
7895 | |
7896 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The | |
7897 operations feed() and advance() return the description of the artifact | |
7898 using the describe() operation. This avoids additional server round trips | |
7899 in the client - the clients gets to know about the new state of the | |
7900 artifact immediately. | |
7901 | |
7902 2011-03-10 Ingo Weinzierl <ingo@intevation.de> | |
7903 | |
7904 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
7905 Implemented a part (step forward) of the advance operation. | |
7906 | |
7907 * TODO: Implement Step-Back in advance operation. | |
7908 | |
7909 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
7910 | |
7911 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: | |
7912 Implemented the abstract method getName(). It returns the constant | |
7913 'winfo' string. | |
7914 | |
7915 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: | |
7916 Implemented the feed action. The data of an incoming feed() operation is | |
7917 stored in StateData objects that are saved in a map in the artifact. | |
7918 | |
7919 NOTE: There is no input validation and no i18n of error messages (see | |
7920 TODO). | |
7921 | |
7922 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
7923 | |
7924 * TODO: This file contains some open points that need to be done. | |
7925 | |
7926 2011-03-09 Ingo Weinzierl <ingo@intevation.de> | |
7927 | |
7928 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New. This | |
7929 artifact serves as the default artifact for the FLYS application. | |
7930 | |
7931 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: This | |
7932 artifact now inherits from FLYSArtifact. Furthermore, there is one big | |
7933 change: we don't store the State objects itself in the artifact, but | |
7934 just the identifier of those. This makes the artifact smaller and more | |
7935 compatible agains previous versions of the software. | |
7936 | |
7937 2011-03-08 Ingo Weinzierl <ingo@intevation.de> | |
7938 | |
7939 * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: | |
7940 New. This service will retrieve a list of provided rivers. | |
7941 | |
7942 * doc/conf/conf.xml: Added a configuration for the RiverService. | |
7943 | |
7944 2011-03-07 Ingo Weinzierl <ingo@intevation.de> | |
7945 | |
7946 * doc/conf/conf.xml: Added a section user-factory and collection-factory in | |
7947 the factories part of the configuration. | |
7948 | |
7949 2011-03-01 Ingo Weinzierl <ingo@intevation.de> | |
7950 | |
7951 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7952 Replaced the 'special' attribute from DESCRIBE with a 'uiprovider' | |
7953 attribute. | |
7954 | |
7955 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
7956 | |
7957 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
7958 RiverSelect state is called to create the UI part of the describe | |
7959 document. | |
7960 | |
7961 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: | |
7962 Implemented the dynamic UI part of describe(). The static part is not | |
7963 inserted into the describe document at the moment. We need a reference to | |
7964 the previous states for this. | |
7965 | |
7966 2011-02-08 Ingo Weinzierl <ingo@intevation.de> | |
7967 | |
7968 * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, | |
7969 src/main/java/de/intevation/flys/artifacts/model/River.java: New. A model | |
7970 class that represents a river and its factory to create concrete river | |
7971 instances. | |
7972 NOTE: Currently, this is just a mockup. The factory just returns two | |
7973 static rivers "Mosel" and "Saar" without a connection to a backend. | |
7974 | |
7975 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
7976 | |
7977 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: The | |
7978 input data of a state is initialized with empty StateData objects after | |
7979 the State has been created. | |
7980 | |
7981 * doc/conf/artifacts/winfo.xml: Renamed the input data nodes of the states | |
7982 which now fits better to the class name of the implementation. | |
7983 | |
7984 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
7985 | |
7986 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The | |
7987 describe document returned by this artifact now contains the current state | |
7988 and the reachable states. | |
7989 | |
7990 2011-02-07 Ingo Weinzierl <ingo@intevation.de> | |
7991 | |
7992 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
7993 The transitions are put into the TransitionEngine with the ID of the state | |
7994 - not longer with the artifact name. On this way, we are able to fetch | |
7995 just the transitions for a specific state, instead of all the transitions | |
7996 of an artifact. | |
7997 | |
7998 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
7999 | |
8000 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Describe() | |
8001 returns the artifact's uuid and hash value. The whole implementation of | |
8002 describe() is still outstanding. | |
8003 | |
8004 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
8005 | |
8006 * doc/conf/artifacts/winfo.xml: Removed useless config stuff. | |
8007 | |
8008 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed | |
8009 useless methods, and improved the init process - the first state is set as | |
8010 the current state for this artifact. | |
8011 | |
8012 * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, | |
8013 src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: New. | |
8014 The states are used in the first two steps of the WINFOArtifact. | |
8015 Currently, they just implement stubs of the necessary methods setup() and | |
8016 describe(). | |
8017 | |
8018 2011-02-04 Ingo Weinzierl <ingo@intevation.de> | |
8019 | |
8020 * src/main/java/de/intevation/flys/artifacts/states/State.java, | |
8021 src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java, | |
8022 src/main/java/de/intevation/flys/artifacts/transitions/Transition.java: | |
8023 Removed. These classes are placed in the artifact-database now. | |
8024 | |
8025 * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java, | |
8026 src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
8027 Adapted imports of Transition. | |
8028 | |
8029 * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: New. | |
8030 This factory should be used to create concrete State objects. | |
8031 | |
8032 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
8033 a constant key to store the StateEngine in the context. | |
8034 | |
8035 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
8036 New method that initializes the states at application start. | |
8037 | |
8038 2011-02-03 Ingo Weinzierl <ingo@intevation.de> | |
8039 | |
8040 * src/main/java/de/intevation/flys/artifacts/states/State.java: New. The | |
8041 interface description of a state. | |
8042 | |
8043 * src/main/java/de/intevation/flys/artifacts/transitions/Transition.java, | |
8044 src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: | |
8045 New. The interface description and a default implementation of a | |
8046 transition. | |
8047 | |
8048 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java: | |
8049 New. The TransitionEngine stores all transitions for each artifact and | |
8050 should be used to determine, if an artifact can advance from one state to | |
8051 another. | |
8052 | |
8053 * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: | |
8054 New. Transitions should be created by using this class. | |
8055 | |
8056 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: New. | |
8057 The Flys context. It currently defines keys to store important components | |
8058 in the context. | |
8059 | |
8060 * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: | |
8061 New. The context factory initializes the basic components of the | |
8062 application. Currently, the TransitionEngine is created and all artifacts | |
8063 with its transitions are read from the global configuration and stored in | |
8064 the FLYSContext. | |
8065 | |
8066 * pom.xml: Added a dependency to the 'artifacts-common' package. | |
8067 | |
8068 * doc/conf/artifacts/winfo.xml: Corrected the classname of the | |
8069 DefaultTransition. | |
8070 | |
8071 * doc/conf/conf.xml: Added FLYSContextFactory as context-factory. | |
8072 | |
8073 2011-02-02 Ingo Weinzierl <ingo@intevation.de> | |
8074 | |
8075 * doc/conf/conf.xml: An initial configuration file for the FLYS artifact | |
8076 server. | |
8077 | |
8078 * doc/conf/artifacts/winfo.xml: An initial transition configuration of an | |
8079 WINFO artifact. | |
8080 | |
8081 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: A stub of | |
8082 an artifact for a WINFO parameterization. | |
8083 | |
8084 * pom.xml: Set the source code version to 1.5. | |
8085 | |
8086 2011-02-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8087 | |
8088 * src/**, pom.xml: Added initial maven project. | |
8089 * ChangeLog: new. |