Mercurial > dive4elements > river

comparison flys-backend/ChangeLog @ 3815:ecab7e7804a9 pre2.6-2012-01-04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged flys-backend/pre2.6-2012-01-04
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Sep 2012 12:14:57 +0200
parents ab1e642e7c85
children 61cb16549eb1
comparison
equal deleted inserted replaced
3814:8083f6384023 3815:ecab7e7804a9
1 2012-01-03 Ingo Weinzierl <ingo@intevation.de>
2
3 * src/main/java/de/intevation/flys/model/Wst.java: Added a method
4 determineMinMaxQFree() that determines the min/max Qs at a given
5 kilometer.
6
7 2012-01-02 Sascha L. Teichmann <sascha.teichmann@intevation.de>
8
9 * doc/schema/postgresql.sql: Remove 'NOT NULL' constraint from
10 gauges.range_id because there are gauges which don't have
11 a 'Gueltigkeitsbereich'
12
13 To adjust existing PostgreSQL databases use:
14
15 ALTER TABLE gauges ALTER COLUMN range_id DROP NOT NULL;
16
17 * src/main/java/de/intevation/flys/model/River.java: Handle
18 null references to 'Gueltigkeitsbereiche'.
19
20 2011-12-28 Ingo Weinzierl <ingo@intevation.de>
21
22 * src/main/java/de/intevation/flys/model/Wst.java: Added a method
23 determineMinMaxQ(double double) to be able to determine the Q range of a
24 WST without having a Range object.
25
26 2011-12-19 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
27
28 * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java:
29 Parse the official 'Pegelnummer' out of the STA files, too.
30
31 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
32 Adjusted import model.
33
34 * src/main/java/de/intevation/flys/model/Gauge.java: Make the
35 official gauge number accessible via Hibernate.
36
37 * doc/schema/postgresql.sql, doc/schema/oracle.sql: Added
38 an official_number to the gauges table.
39
40 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
41
42 * doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467
43 (GK3) coordinates.
44
45 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
46
47 * doc/schema/oracle-spatial.sql: Adjust extent to the extent of germany
48 and srs to 31467 in USER_SDO_GEOM_METADATA.
49
50 2011-11-29 Bjoern Schilberg <bjoern.schilberg@intevation.de>:
51
52 * doc/schema/oracle_create_user.sql: Fixed notation of the table in the
53 alter statement.
54
55 2011-11-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
56
57 Fixed flys/issue415
58
59 * doc/schema/oracle.sql: Increased precision of a and b in ranges.
60
61 2011-11-10 Ingo Weinzierl <ingo@intevation.de>
62
63 * src/main/java/de/intevation/flys/model/Building.java,
64 src/main/java/de/intevation/flys/model/Fixpoint.java: Added functions
65 that return a list of Buildings/Fixpoints for a given river.
66
67 2011-11-10 Ingo Weinzierl <ingo@intevation.de>
68
69 * doc/schema/oracle-spatial.sql,
70 doc/schema/postgresql-spatial.sql: Adapted the "kind" field of "lines"
71 relation (Int -> Varchar).
72
73 * doc/schema/oracle-spatial_idx.sql: Added missing spatial index for
74 "lines" relation.
75
76 * src/main/java/de/intevation/flys/model/Line.java: Added a function that
77 returns all lines of a given river.
78
79 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
80
81 * src/main/java/de/intevation/flys/model/Catchment.java: New. A model for
82 the 'catchment' relation.
83
84 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
85 Registered the Catchment model.
86
87 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
88
89 * doc/schema/postgresql-spatial.sql: Synced "hws" relation with oracle
90 schema.
91
92 * src/main/java/de/intevation/flys/model/Hws.java: New. A model for the
93 "hws" relation.
94
95 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
96 Registered the Hws model.
97
98 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
99
100 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
101 Added methods that return information about the database connection used
102 by a concrete SessionFactoryImpl.
103
104 2011-11-09 Ingo Weinzierl <ingo@intevation.de>
105
106 * src/main/java/de/intevation/flys/model/Floodplain.java: Changed the
107 geometry type from MultiPolygon to Polygon.
108
109 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
110 Added a function that returns the db driver of a given
111 SessionFactoryImpl instance.
112
113 2011-11-01 Ingo Weinzierl <ingo@intevation.de>
114
115 * src/main/java/de/intevation/flys/model/RiverAxisKm.java: New. Model class
116 for 'river_axes_km' relation.
117
118 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
119 Added mapping for RiverAxisKm.
120
121 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de>
122
123 * doc/schema/oracle_create_user.sql:
124 Added explizit TABLESPACE definition for the user.
125
126 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de>
127
128 * doc/schema/oracle_create_user.sql:
129 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change
130 tablespace to users.
131
132 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
133
134 * src/main/java/de/intevation/flys/utils/DateGuesser.java:
135 New. Date guesser from desktop FLYS.
136
137 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java:
138 Try to parse the name of a WST column as a date and store
139 the date into the database
140
141 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
142 Added code to store the date of the column in the database.
143
144 2011-10-24 Bjoern Schilberg <bjoern.schilberg@intevation.de>
145
146 * doc/schema/postgresql-spatial.sql:
147 Adjusted geometry type for floodplain and hws in AddGeometryColumn.
148
149 2011-10-19 Bjoern Schilberg <bjoern.schilberg@intevation.de>
150
151 * doc/schema/oracle.sql:
152 Added missing views (wst_value_table,wst_w_values,wst_q_values).
153
154 2011-10-18 Bjoern Schilberg <bjoern.schilberg@intevation.de>
155
156 * doc/schema/oracle.sql:
157 Removed all CREATE OR REPLACE TRIGGER statements.
158
159 2011-10-17 Bjoern Schilberg <bjoern.schilberg@intevation.de>
160
161 * doc/schema/oracle.sql:
162 Adjusted NUMBER format for units, positions and cross_section_points tables.
163
164 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de>
165
166 * doc/schema/oracle.sql:
167 Fix errors.
168
169 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de>
170
171 * doc/schema/oracle.sql:
172 Adjust oracle schema [I382].
173
174 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de>
175
176 * src/main/java/de/intevation/flys/importer/ImportWst.java,
177 src/main/java/de/intevation/flys/importer/ImportUnit.java:
178 Removed obsolete imports.
179
180 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
181
182 * ChangeLog: Added database update statements.
183
184 To update existing databases:
185
186 BEGIN;
187 CREATE SEQUENCE UNITS_ID_SEQ;
188 CREATE TABLE units (
189 id int PRIMARY KEY NOT NULL,
190 name VARCHAR(32) NOT NULL UNIQUE
191 );
192 ALTER TABLE rivers ADD COLUMN wst_unit_id int REFERENCES units(id);
193 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NN + m');
194 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NHN + m');
195 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NHN + m') WHERE name = 'Elbe';
196 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NN + m') WHERE name <> 'Elbe';
197 ALTER TABLE rivers ALTER COLUMN wst_unit_id SET NOT NULL;
198 COMMIT;
199
200 2011-10-05 Ingo Weinzierl <ingo@intevation.de>
201
202 * contrib/dump-schema.sh: New. A small shell script that dumps the
203 database schema of a given database to SQL.
204
205 * pom.xml: Added dependency for hibernate-spatial-oracle stuff.
206
207 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
208
209 * doc/schema/postgresql.sql: Removed unit column from wsts; added a
210 wst_unit_id column to rivers. We decided to support a single elevation
211 model for the whole river.
212
213 * src/main/java/de/intevation/flys/model/River.java: Added a WstUnit
214 column.
215
216 * src/main/java/de/intevation/flys/model/Wst.java: Removed the Unit
217 column.
218
219 * src/main/java/de/intevation/flys/importer/ImportWst.java: Provide a
220 getUnit() method that allows querying the elevation unit for this wst.
221
222 * src/main/java/de/intevation/flys/importer/ImportUnit.java: Removed
223 storeDependencies().
224
225 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save the
226 Unit of the wst file or a default one into database before all other
227 dependencies as well as the river itself is saved to database.
228
229 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
230
231 * doc/schema/postgresql.sql: Added a "units" table.
232
233 * src/main/java/de/intevation/flys/model/Unit.java: New. Model class that
234 represents a unit.
235
236 * src/main/java/de/intevation/flys/importer/ImportUnit.java: New. Model
237 class that is used to import units.
238
239 * src/main/java/de/intevation/flys/model/Wst.java: A Wst stores a Unit
240 which references "units" table now.
241
242 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: Set
243 units which have already been parsed on Wsts.
244
245 * src/main/java/de/intevation/flys/importer/ImportWst.java: Added setter
246 method for Units and call storeDependencies() for ImportUnits.
247
248 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
249 Registered new model class Unit.
250
251 2011-10-04 Ingo Weinzierl <ingo@intevation.de>
252
253 flys/issue333 (W-INFO / Berechnung Wasserspiegellage, Zuordnung Bezugspegel)
254
255 * src/main/java/de/intevation/flys/model/River.java: Modified
256 determination of gauge based on a km range. River.determineGauge(double,
257 double) will now return the gauge which matches the start km.
258
259 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de>
260
261 * src/main/java/de/intevation/flys/utils/StringUtil.java:
262 (wWrap): New method (extracted from WaterlevelSelectState).
263
264 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de>
265
266 * src/main/java/de/intevation/flys/utils/StringUtil.java:
267 (unbracket): New method (extracted from WaterlevelSelectState).
268
269 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de>
270
271 * src/main/java/de/intevation/flys/model/CrossSectionLine.java:
272 Moved some logic from cross section demo app to this model.
273
274 2011-09-26 Ingo Weinzierl <ingo@intevation.de>
275
276 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java:
277 Added new function that the nearest CrossSectionTrack of a river to a
278 given kilometer.
279
280 2011-09-23 Bjoern Schilberg <bjoern@intevation.de>
281
282 * doc/schema/postgresql-spatial.sql:
283 Added missing river_axes_km schema.
284 * doc/schema/oracle-spatial.sql:
285 Added missing dem and lines schema.
286
287 2011-09-22 Bjoern Schilberg <bjoern@intevation.de>
288
289 * doc/schema/postgresql-spatial.sql, doc/schema/oracle-spatial.sql:
290 Harmonized oracle and postgresql spatial schema.
291
292 2011-09-22 Bjoern Schilberg <bjoern@intevation.de>
293
294 * doc/schema/oracle-spatial.sql: Harmonized Extent for Saar and Mosel. Some cleanups.
295
296 2011-09-22 Ingo Weinzierl <ingo@intevation.de>
297
298 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
299 Added the possibility to enable JMX (/MBean) support for hibernate. By
300 default, this support is NOT enabled. To enable JMX support for
301 hibernate, set the system property "flys.backend.enablejmx=true".
302
303 2011-09-20 Bjoern Schilberg <bjoern@intevation.de>
304
305 * doc/schema/oracle_create_user.sql: Added right to create views.
306
307 2011-09-20 Bjoern Schilberg <bjoern@intevation.de>
308
309 * doc/schema/oracle-spatial.sql: Generalized oracle spatial schema.
310
311 2011-09-19 Ingo Weinzierl <ingo@intevation.de>
312
313 Tagged RELEASE 2.5
314
315 * Changes: Prepared changes for release.
316
317 2011-09-16 Ingo Weinzierl <ingo@intevation.de>
318
319 * src/main/java/de/intevation/flys/model/DGM.java: Added function to query
320 a DGM by Id.
321
322 2011-09-15 Bjoern Schilberg <bjoern@intevation.de>
323
324 * pom.xml: Removed oracle dependency.
325
326 2011-09-15 Bjoern Schilberg <bjoern@intevation.de>
327
328 * doc/schema/oracle.sql: Added inital oracle schema.
329
330 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
331
332 * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql
333 script.
334
335 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
336
337 * doc/schema/oracle-spatial.sql: Deactivated spatial indexes.
338
339 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
340
341 * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql
342 script.
343
344 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
345
346 * doc/schema/oracle-spatial.sql: Added schema floodplain.
347
348 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
349
350 * doc/schema/oracle-spatial.sql: Added schema hws.
351
352 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
353
354 * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks.
355
356 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
357
358 * doc/schema/oracle-spatial.sql: Added schema river_axes.
359
360 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
361
362 * doc/schema/oracle-spatial.sql: Added schema fixpoints.
363
364 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
365
366 * doc/schema/oracle-spatial.sql: Added schema buildings.
367
368 2011-09-14 Bjoern Schilberg <bjoern@intevation.de>
369
370 * doc/schema/oracle-spatial.sql: Fixed table river_axes_km.
371
372 2011-09-13 Bjoern Schilberg <bjoern@intevation.de>
373
374 * doc/schema/oracle-spatial.sql: Added initial oracle schemas.
375
376 2011-09-12 Bjoern Schilberg <bjoern@intevation.de>
377
378 * doc/schema/postgresql-spatial.sql: Added initial schemas for
379 Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr.
380 Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp,
381 BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp,
382 Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung,
383 Hydrologie/UeSG/Messung
384
385 2011-09-02 Ingo Weinzierl <ingo@intevation.de>
386
387 * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema.
388 Auto-Increment is realized through SERIALs now.
389
390 * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has
391 been renamed to 'dem' (before 'dgm').
392
393 2011-09-01 Hans Plum <hans@intevation.de>
394
395 * doc/schema/postgresql-spatial.sql:
396 Hint for unifying table names: dgm -> dem
397
398 2011-09-01 Hans Plum <hans@intevation.de>
399
400 * doc/schema/postgresql-spatial.sql:
401 Added mappings to existing data in file system (based on
402 river Saar); added TODOs for missing tables/mappings
403
404 2011-08-31 Ingo Weinzierl <ingo@intevation.de>
405
406 * doc/schema/postgresql-spatial.sql: New relation for floodplains (german
407 "Talaue").
408
409 * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class
410 that represents a floodplain.
411
412 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
413 Registered the Floodplain mapping.
414
415 2011-08-31 Ingo Weinzierl <ingo@intevation.de>
416
417 * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that
418 no data of the DGM is stored in this relation, but only the file path to
419 the DGM file.
420
421 * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides
422 information for a DGM (km range and file path).
423
424 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
425 Registered the DGM.
426
427 2011-08-30 Ingo Weinzierl <ingo@intevation.de>
428
429 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New
430 static function to retrieve all CrossSectionTracks of a specific river.
431
432 2011-08-25 Ingo Weinzierl <ingo@intevation.de>
433
434 * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to
435 artifacts-common module.
436
437 * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java,
438 src/main/java/de/intevation/flys/importer/parsers/PRFParser.java,
439 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java,
440 src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java,
441 src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java,
442 src/main/java/de/intevation/flys/importer/ImportRiver.java,
443 src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted
444 imports of FileTools.
445
446 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de>
447
448 * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues)
449 (setMainValues):
450 New method and mapping to get/set MainValues of a Gauge. Essentially
451 developed by Sascha L. Teichmann.
452
453 2011-08-22 Ingo Weinzierl <ingo@intevation.de>
454
455 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
456 Reverted the default db dialect to PostgreSQL - this has been changed to
457 PostGIS by accident.
458 Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to
459 use the PostGIS stuff.
460
461 2011-08-22 Ingo Weinzierl <ingo@intevation.de>
462
463 * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function
464 that returns the RiverAxis for a given River.
465
466 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new
467 function of RiverAxis to retrieve the RiverAxis.
468
469 2011-08-18 Ingo Weinzierl <ingo@intevation.de>
470
471 * doc/schema/postgresql-spatial.sql: The PostGIS database schema for
472 FLYS spatial data.
473
474 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java,
475 src/main/java/de/intevation/flys/model/RiverAxis.java,
476 src/main/java/de/intevation/flys/model/Line.java,
477 src/main/java/de/intevation/flys/model/Building.java,
478 src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that
479 represent FLYS spatial data.
480
481 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
482 Registered model classes.
483
484 * pom.xml: Added dependencies to HibernateSpatial and PostGIS.
485
486 * src/main/java/de/intevation/flys/backend/SpatialInfo.java,
487 contrib/spatial-info.sh: A small demo application that prints out some
488 information about spatial data of specific rivers. Modify the system
489 property -Dflys.backend.spatial.river to get information of a river of
490 your choice.
491
492 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de>
493
494 Re-enabled Hibernate schema dumps.
495
496 * src/main/java/de/intevation/flys/App.java: Removed old code
497 and use new SessionFactoryProvider infrastructure.
498
499 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
500 Added methods to create db configurations without opening them.
501 Useful for introspection only purposes.
502
503 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de>
504
505 * pom.xml: Bumped Apache DBCP up to 1.4 to use the same version
506 as artifact database.
507
508 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de>
509
510 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
511 Make use of the LRU cache from artifacts common.
512
513 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
514
515 * doc/schema/postgresql.sql: Added missing foreign key contraint on hyks table.
516 To update existing databases:
517
518 ALTER TABLE hyks ADD CONSTRAINT hyks_river_id_fkey FOREIGN KEY (river_id) REFERENCES rivers(id);
519
520 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
521
522 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java:
523 Check if zone coordinates in HYKs are swapped and warn the user.
524
525 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
526
527 * src/main/java/de/intevation/flys/model/HYK.java
528 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java,
529 src/main/java/de/intevation/flys/importer/ImportHYKFormation.java,
530 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java,
531 src/main/java/de/intevation/flys/importer/ImportHYK.java:
532 Various small fixes and some extra logging.
533
534 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
535
536 * src/main/java/de/intevation/flys/importer/Config.java: New.
537 Central singleton to configure the Importer.
538 Uses system properties by now:
539
540 flys.backend.importer.dry.run: boolean
541 default false. true: don't write to database.
542
543 flys.backend.importer.annotation.types: String
544 default unset. Filename of annotation type classifications.
545
546 flys.backend.importer.skip.gauges: boolean
547 default: false. true: don't parse/store *.glt, *.sta files
548
549 flys.backend.importer.skip.annotations: boolean
550 default: false. true: don't parse/store *.km files
551
552 flys.backend.importer.skip.prfs: boolean
553 default: false. true: don't parse/store *.prf files
554
555 flys.backend.importer.skip.hyks: boolean
556 default: false. true: don't parse/store *.hyk files
557
558 flys.backend.importer.skip.wst: boolean
559 default: false. true: don't parse/store river wst files
560
561 flys.backend.importer.skip.extra.wsts: boolean
562 default: false. true: don't parse/store extra *.zus, *.wst files
563
564 flys.backend.importer.skip.fixations: boolean
565 default: false. true: don't parse/store fixation *.wst files
566
567 flys.backend.importer.skip.official.lines: boolean
568 default: false. true: don't parse/store 'amtliche Linien' *.wst files
569
570 flys.backend.importer.skip.flood.water: boolean
571 default: false. true: don't parse/store 'HW-Marken' *.wst files
572
573 flys.backend.importer.skip.flood.protection: boolean
574 default: false. true: don't parse/store 'HW-Schutzanlagen' *.wst files
575
576 2011-07-18 Ingo Weinzierl <ingo@intevation.de>
577
578 * src/main/java/de/intevation/flys/model/HYKEntry.java: Fixed OrderBy
579 clause.
580
581 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
582
583 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java,
584 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java,
585 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java,
586 src/main/java/de/intevation/flys/importer/ImportRiver.java,
587 src/main/java/de/intevation/flys/importer/ImportHYK.java:
588 Store HYK data structures to database. Needs testing.
589
590 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
591
592 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
593 Parse the HYKs from the importer. TODO: Store them in database.
594
595 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
596
597 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java:
598 Create data structures while parsing.
599
600 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java,
601 src/main/java/de/intevation/flys/importer/ImportHYK.java: Added
602 getters/setters to ease model wiring.
603
604 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
605
606 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java,
607 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java,
608 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java,
609 src/main/java/de/intevation/flys/importer/ImportHYK.java: New.
610 Importer models for HYKs.
611
612 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
613
614 * doc/schema/postgresql.sql: Each entry in a HYK can have
615 an optional 'Peilungsjahr' (measure) not only the whole HYK.
616 To update existing databases:
617 BEGIN;
618 ALTER TABLE hyks DROP COLUMN measure;
619 ALTER TABLE hyk_entries ADD COLUMN measure TIMESTAMP;
620 COMMIT;
621
622 * src/main/java/de/intevation/flys/model/HYKEntry.java,
623 src/main/java/de/intevation/flys/model/HYK.java:
624 Adjusted Hibernate models.
625
626 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
627
628 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java:
629 Added callback mechanism and recursive file search like in the PRF parser.
630 All BfG-HYK files seem to parse correctly now. TODO: Build the data structures.
631
632 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java:
633 Added x.canRead() before accepting files for parsing.
634
635 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
636
637 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java:
638 Initial version of the HYK parser. Not ready, yet.
639
640 * src/main/java/de/intevation/flys/importer/ImportHYKFlowZoneType.java:
641 Importer model for HYK flow zone types.
642
643 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
644
645 * doc/schema/postgresql.sql: Argh! Added distance_{vl|hf|vr} to
646 wrong table.
647 To update existing databases:
648 BEGIN;
649 ALTER TABLE hyk_entries DROP COLUMN distance_vl;
650 ALTER TABLE hyk_entries DROP COLUMN distance_hf;
651 ALTER TABLE hyk_entries DROP COLUMN distance_vr;
652 ALTER TABLE hyk_formations ADD COLUMN distance_vl NUMERIC NOT NULL;
653 ALTER TABLE hyk_formations ADD COLUMN distance_hf NUMERIC NOT NULL;
654 ALTER TABLE hyk_formations ADD COLUMN distance_vr NUMERIC NOT NULL;
655 COMMIT;
656
657 * src/main/java/de/intevation/flys/model/HYKFormation.java,
658 src/main/java/de/intevation/flys/model/HYKEntry.java:
659 Adjusted Hibernate models.
660
661 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
662
663 * src/main/java/de/intevation/flys/utils/FileTools.java: Added method
664 walkTree() to traverse a directory tree. To be reused in HYK parser.
665
666 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java:
667 Uses the FileTools.walkTree() method now to find all PRF file.
668
669 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
670
671 * doc/schema/postgresql.sql: Added missing columns.
672 To update existing databases:
673 BEGIN;
674 ALTER TABLE hyks ADD COLUMN measure TIMESTAMP;
675 ALTER TABLE hyk_entries ADD COLUMN distance_vl NUMERIC NOT NULL;
676 ALTER TABLE hyk_entries ADD COLUMN distance_hf NUMERIC NOT NULL;
677 ALTER TABLE hyk_entries ADD COLUMN distance_vr NUMERIC NOT NULL;
678 COMMIT;
679
680 * src/main/java/de/intevation/flys/model/HYKEntry.java,
681 src/main/java/de/intevation/flys/model/HYK.java:
682 Adjusted Hibernate models.
683
684 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
685
686 * src/main/java/de/intevation/flys/importer/parsers/*.java:
687 New package. Moved the file parsers (*.gew, *.sta, *.at, *.glt, *.prf, *.km, *.wst)
688 into this package.
689
690 * src/main/java/de/intevation/flys/importer/*.java: Adjusted the imports.
691
692 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
693
694 * src/main/java/de/intevation/flys/model/HYKFormation.java,
695 src/main/java/de/intevation/flys/model/HYKEntry.java,
696 src/main/java/de/intevation/flys/model/HYKFlowZone.java,
697 src/main/java/de/intevation/flys/model/HYKFlowZoneType.java,
698 src/main/java/de/intevation/flys/model/HYK.java: New. The hibernate models
699 for the HYK structures.
700
701 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
702 Registered new models.
703
704 * src/main/java/de/intevation/flys/model/CrossSection.java: Added
705 'order by' annotation for fetching the cross section lines.
706
707 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
708
709 * doc/schema/postgresql.sql: Added structures for HYKs "Hydraulische Kenngroessen"
710 To update existing databases:
711
712 BEGIN;
713 CREATE SEQUENCE HYKS_ID_SEQ;
714 CREATE TABLE hyks (
715 id int PRIMARY KEY NOT NULL,
716 river_id int NOT NULL,
717 description VARCHAR(256) NOT NULL
718 );
719
720 CREATE SEQUENCE HYK_ENTRIES_ID_SEQ;
721 CREATE TABLE hyk_entries (
722 id int PRIMARY KEY NOT NULL,
723 hyk_id int NOT NULL REFERENCES hyks(id),
724 km NUMERIC NOT NULL,
725 UNIQUE (hyk_id, km)
726 );
727
728 CREATE SEQUENCE HYK_FORMATIONS_ID_SEQ;
729 CREATE TABLE hyk_formations (
730 id int PRIMARY KEY NOT NULL,
731 formation_num int NOT NULL DEFAULT 0,
732 hyk_entry_id int NOT NULL REFERENCES hyk_entries(id),
733 top NUMERIC NOT NULL,
734 bottom NUMERIC NOT NULL,
735 UNIQUE (hyk_entry_id, formation_num)
736 );
737
738 CREATE SEQUENCE HYK_FLOW_ZONE_TYPES_ID_SEQ;
739 CREATE TABLE hyk_flow_zone_types (
740 id int PRIMARY KEY NOT NULL,
741 name VARCHAR(50) NOT NULL UNIQUE,
742 description VARCHAR(256)
743 );
744
745 CREATE SEQUENCE HYK_FLOW_ZONES_ID_SEQ;
746 CREATE TABLE hyk_flow_zones (
747 id int PRIMARY KEY NOT NULL,
748 formation_id int NOT NULL REFERENCES hyk_formations(id),
749 type_id int NOT NULL REFERENCES hyk_flow_zone_types(id),
750 a NUMERIC NOT NULL,
751 b NUMERIC NOT NULL,
752 CHECK (a <= b)
753 );
754 COMMIT;
755
756 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de>
757
758 * pom.xml: Bumped Hibernate up to 3.6.5.
759
760 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de>
761
762 * src/main/java/de/intevation/flys/utils/FileTools.java: Argh!
763 Forget to call the file hashing so only the file lengths were
764 compared.
765
766 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de>
767
768 * src/main/java/de/intevation/flys/utils/FileTools.java:
769 Added a class HashedFile to compare files by there length
770 and a message digest. Digest can be set with system property
771 "flys.backend.file.cmp.digest" and defaults to MD5. Useful to
772 detect file duplicates.
773
774 * src/main/java/de/intevation/flys/importer/PRFParser.java: Added
775 method prfAccept(File) to callback to check if a found PRF file
776 should be parsed. Useful to prevent parsing file duplicates.
777
778 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
779 Use the HashedFile and the PRFParser.Callback to prevent
780 parsing of PRF duplicates.
781
782 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
783
784 * doc/schema/postgresql.sql: Misspelled sequence.
785 To update existing databases:
786
787 DROP SEQUENCE CROSS_SECTION_LINES_SEQ;
788 CREATE SEQUENCE CROSS_SECTION_LINES_ID_SEQ;
789
790 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java:
791 Added some logging because importing is slow.
792
793 * src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java:
794 Prevent NPE if a cross section line from db has no points.
795
796 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
797
798 Parse all PRFs in all subfolders of a river and store them
799 as cross sections into the database. Needs testing!
800
801 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java,
802 src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java:
803 New. Importer models for cross sections.
804
805 * src/main/java/de/intevation/flys/importer/XY.java:
806 New. Made top level class from inner PRFParser.XY.
807
808 * src/main/java/de/intevation/flys/importer/PRFParser.java:
809 Moved out XY class. Renamed callback.
810
811 * src/main/java/de/intevation/flys/model/CrossSection.java,
812 src/main/java/de/intevation/flys/model/CrossSectionLine.java,
813 src/main/java/de/intevation/flys/model/CrossSectionPoint.java,
814 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
815 Added convinience constructors.
816
817 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
818 Parse and store cross sections into database.
819
820 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
821
822 * doc/schema/postgresql.sql: Introduced a new table cross_section_line
823 holding the km of a set of points.
824
825 * src/main/java/de/intevation/flys/model/CrossSectionLine.java:
826 New. Model for a single line of a "Querprofil".
827
828 * src/main/java/de/intevation/flys/model/CrossSection.java: Removed
829 'km' and 'points' they are part of the line now.
830
831 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java:
832 They reference to the containing line now.
833
834 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
835 Registered new model.
836
837 To update existing databases:
838 BEGIN;
839 DROP SEQUENCE CROSS_SECTIONS_ID_SEQ;
840 DROP SEQUENCE CROSS_SECTION_POINTS_ID_SEQ;
841 DROP TABLE cross_section_points;
842 DROP TABLE cross_sections;
843 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ;
844 CREATE TABLE cross_sections (
845 id int PRIMARY KEY NOT NULL,
846 river_id int NOT NULL REFERENCES rivers(id),
847 time_interval_id int REFERENCES time_intervals(id),
848 description VARCHAR(256)
849 );
850 CREATE SEQUENCE CROSS_SECTION_LINES_SEQ;
851 CREATE TABLE cross_section_lines (
852 id int PRIMARY KEY NOT NULL,
853 km NUMERIC NOT NULL,
854 cross_section_id int NOT NULL REFERENCES cross_sections(id),
855 UNIQUE (km, cross_section_id)
856 );
857 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ;
858 CREATE TABLE cross_section_points (
859 id int PRIMARY KEY NOT NULL,
860 cross_section_line_id int NOT NULL REFERENCES cross_section_lines(id),
861 col_pos int NOT NULL,
862 x NUMERIC NOT NULL,
863 y NUMERIC NOT NULL,
864 UNIQUE (cross_section_line_id, col_pos)
865 );
866 COMMIT;
867
868 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
869
870 * doc/schema/postgresql.sql: Dropped constraint that enforces the
871 uniqueness of km and river. This is violated because there are
872 more than one sounding in different year at the same km of a river.
873 Added column 'description' to the cross section table to make it
874 human readable.
875
876 To update existing databases:
877
878 ALTER TABLE cross_sections DROP CONSTRAINT cross_sections_km_key;
879 ALTER TABLE cross_sections ADD COLUMN description VARCHAR(256);
880
881 * src/main/java/de/intevation/flys/model/CrossSection.java:
882 Added the description column to the Hibernate model.
883
884 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
885
886 * doc/schema/postgresql.sql: Dropped constraint that enforces the
887 uniqueness of x in a "Querprofil-Spur". There are vertical lines
888 in the soundings so this constraint is violated.
889
890 To update existing databases:
891
892 ALTER TABLE cross_section_points DROP CONSTRAINT cross_section_points_cross_section_id_key2;
893
894 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
895
896 * src/main/java/de/intevation/flys/importer/PRFParser.java:
897 Added a callback to be called from parsePRFs() if
898 a PRF was parsed successfully. Useful to scan whole
899 sub directories for PRF files.
900
901 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
902
903 * src/main/java/de/intevation/flys/importer/PRFParser.java:
904 Extract the year of sounding from file names. If not found
905 from the name of th containing directory. Description is made
906 of file name and parent directory file name.
907
908 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
909
910 * src/main/java/de/intevation/flys/importer/PRFParser.java:
911 Extracted the data. All BfG PRFs are parsed correctly, now.
912
913 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de>
914
915 * src/main/java/de/intevation/flys/importer/PRFParser.java:
916 Extract km from lines. TODO: extract data.
917
918 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
919
920 * src/main/java/de/intevation/flys/importer/PRFParser.java: New.
921 Parser for PRF files. TODO extra data and station from data lines.
922
923 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
924
925 * src/main/java/de/intevation/flys/model/Point3d.java: Deleted.
926 Not needed (braindead).
927
928 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java:
929 Directly store the x/y values now.
930
931 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
932 Removed registration of Point3d.
933
934 To update existing databases:
935
936 BEGIN;
937 ALTER TABLE cross_section_points DROP COLUMN point3d_id;
938 DROP SEQUENCE POINTS3D_ID_SEQ;
939 DROP TABLE points3d;
940 ALTER TABLE cross_section_points ADD COLUMN x NUMERIC NOT NULL;
941 ALTER TABLE cross_section_points ADD COLUMN y NUMERIC NOT NULL;
942 ALTER TABLE cross_section_points ADD CONSTRAINT
943 cross_section_points_cross_section_id_key2 UNIQUE (cross_section_id, x);
944 COMMIT;
945
946 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
947
948 * src/main/java/de/intevation/flys/model/CrossSection.java,
949 src/main/java/de/intevation/flys/model/CrossSectionPoint.java:
950 New. Hibernate models for cross-sections and their forming points.
951
952 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
953 Registered the new models.
954
955 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
956
957 * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model
958 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
959 Registered point3d model.
960
961 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
962
963 * doc/schema/postgresql.sql: Add relations for cross sections.
964 To update existing databases:
965 BEGIN;
966
967 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ;
968 CREATE TABLE cross_sections (
969 id int PRIMARY KEY NOT NULL,
970 km NUMERIC NOT NULL,
971 river_id int NOT NULL REFERENCES rivers(id),
972 time_interval_id int REFERENCES time_intervals(id),
973 UNIQUE (km, river_id)
974 );
975
976 CREATE SEQUENCE POINTS3D_ID_SEQ;
977 CREATE TABLE points3d (
978 id int PRIMARY KEY NOT NULL,
979 x NUMERIC NOT NULL,
980 y NUMERIC NOT NULL,
981 z NUMERIC NOT NULL
982 );
983
984 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ;
985 CREATE TABLE cross_section_points (
986 id int PRIMARY KEY NOT NULL,
987 cross_section_id int NOT NULL REFERENCES cross_sections(id),
988 point3d_id int NOT NULL REFERENCES points3d(id),
989 col_pos int NOT NULL,
990 UNIQUE (cross_section_id, point3d_id, col_pos),
991 UNIQUE (cross_section_id, col_pos)
992 );
993
994 COMMIT;
995
996 2011-06-28 Ingo Weinzierl <ingo@intevation.de>
997
998 Tagged RELEASE 2.4
999
1000 2011-06-27 Ingo Weinzierl <ingo@intevation.de>
1001
1002 * Changes: Prepared changes for the upcoming release.
1003
1004 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1005
1006 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java,
1007 src/main/java/de/intevation/flys/importer/AnnotationClassifier.java,
1008 src/main/java/de/intevation/flys/importer/AtFileParser.java,
1009 src/main/java/de/intevation/flys/importer/ValueKey.java,
1010 src/main/java/de/intevation/flys/importer/WstParser.java:
1011 Removed trailing whitespace.
1012
1013 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1014
1015 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
1016 Removed superfluous imports.
1017
1018 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1019
1020 * src/main/java/de/intevation/flys/model/River.java:
1021 Added a method maxOverlap to determine the gauge which has
1022 the max common length to a given interval. This is for
1023 numerical stability in slightly overlapping gauge ranges.
1024
1025 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1026
1027 * src/main/java/de/intevation/flys/model/River.java: When
1028 looking up a gauge by km containment use precision of 1e-6.
1029
1030 2011-06-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1031
1032 * src/main/java/de/intevation/flys/model/River.java:
1033 Added method to find gauge by its name.
1034
1035 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1036
1037 * doc/annotation-types.xml: Fixed some rules.
1038
1039 * src/main/java/de/intevation/flys/importer/Importer.java,
1040 src/main/java/de/intevation/flys/importer/InfoGewParser.java,
1041 src/main/java/de/intevation/flys/importer/ImportRiver.java:
1042 Call the right constructors now.
1043
1044 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java:
1045 Added getter/setter for name property.
1046
1047 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java:
1048 Print duplicated at WARN level not as DEBUG.
1049
1050 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
1051 Fixed XPath expression to build the internal lookup structures
1052 correctly.
1053
1054 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1055
1056 Added classification of annotation types. Needs testing!
1057
1058 * doc/annotation-types.xml: New. Rules to classify the different
1059 types of annotations. The classification works like this:
1060
1061 There are unique types like 'Bruecke', 'Pegel' and so on.
1062 They are defined in the /annotation/type section and
1063 identified by their name. One of the types can be set
1064 as the default type if no rule applies.
1065
1066 In the /annotation/pattern section are two types of pattern.
1067
1068 1 - file pattern: If a KM file is opened its filename is
1069 matched against the regular expressions of these
1070 patterns. If a match is found the corresponding type
1071 is used as the default type in the open file.
1072 If no match is found the global default type is used
1073 as the default type.
1074
1075 2 - line patterns: For each line of an open KM file these
1076 patterns are applied to find a match. If a match is
1077 found the corresponding type is used as the type of
1078 the annotation. If no match is found the default
1079 file default is assumed to be the right type. For
1080 the file default see 1.
1081
1082 * src/main/java/de/intevation/flys/importer/Importer.java:
1083 To activate the annotation type classification set
1084 the system property
1085
1086 'flys.backend.importer.annotation.types'
1087
1088 to the path of a XML looking like the annotation-types.xml
1089 file. If the system property is not set no classification
1090 is done.
1091
1092 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
1093 New. Implements the classification.
1094
1095 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java,
1096 src/main/java/de/intevation/flys/importer/InfoGewParser.java,
1097 src/main/java/de/intevation/flys/importer/ImportRiver.java:
1098 Looped through the annotation type classification.
1099
1100 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1101
1102 * src/main/java/de/intevation/flys/model/River.java:
1103 Added method to find gauge by a position lying in its range.
1104
1105 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1106
1107 First part of flys/issue18
1108
1109 * doc/schema/postgresql.sql: Add new table 'annotation_types'.
1110 To update existing databases:
1111 BEGIN;
1112 CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ;
1113 CREATE TABLE annotation_types (
1114 id int PRIMARY KEY NOT NULL,
1115 name VARCHAR(256) NOT NULL UNIQUE
1116 );
1117 ALTER TABLE annotations ADD COLUMN type_id int REFERENCES annotation_types(id);
1118 COMMIT;
1119
1120 * doc/schema/postgresql-cleanup.sql: Removed. Hopeless out-dated.
1121
1122 * src/main/java/de/intevation/flys/model/AnnotationType.java:
1123 New. Hibernate model to access the type.
1124
1125 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
1126 Register the new backend type.
1127
1128 * src/main/java/de/intevation/flys/model/Annotation.java:
1129 References the annotation type.
1130
1131 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java:
1132 New. Model to help import the annotation type.
1133
1134 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java:
1135 Uses the import type.
1136
1137 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java:
1138 Set the annotation type to 'null'. TODO: Do the classification!
1139
1140 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1141
1142 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1143 Fix for flys/issue110. start index was shifted by one.
1144
1145 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1146
1147 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java:
1148 Forgot to store reference to edge.
1149
1150 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1151
1152 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
1153 Register backend model.
1154
1155 * src/main/java/de/intevation/flys/importer/ImportEdge.java: New. Model
1156 for importing the edges.
1157
1158 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java:
1159 Parses the edges of an annotation, too.
1160
1161 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1162
1163 * doc/schema/postgresql.sql: Added table edges to model 'Kanten' of an annotation.
1164 To update existing databases:
1165 BEGIN;
1166 CREATE SEQUENCE EDGES_ID_SEQ;
1167 CREATE TABLE edges (
1168 id int PRIMARY KEY NOT NULL,
1169 top NUMERIC,
1170 bottom NUMERIC);
1171 ALTER TABLE annotations ADD COLUMN edge_id int REFERENCES edges(id);
1172 COMMIT;
1173
1174 * src/main/java/de/intevation/flys/model/Edge.java: New. A 'Kanten'-Model.
1175 * src/main/java/de/intevation/flys/model/Annotation.java: References the
1176 edges.
1177
1178 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1179
1180 * src/main/java/de/intevation/flys/model/River.java:
1181 Added method to find gauge only by station position.
1182
1183 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1184
1185 * src/main/java/de/intevation/flys/model/River.java:
1186 Make search for gauges independent of from/to order.
1187
1188 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1189
1190 * doc/schema/postgresql.sql: Added a new view to select qs of a WST.
1191 To update existing databases:
1192
1193 CREATE VIEW wst_q_values AS
1194 SELECT wc.position AS column_pos,
1195 wqr.q AS q,
1196 r.a AS a,
1197 r.b AS b,
1198 wc.wst_id AS wst_id
1199 FROM wst_column_q_ranges wcqr
1200 JOIN wst_q_ranges wqr ON wcqr.wst_q_range_id = wqr.id
1201 JOIN ranges r ON wqr.range_id = r.id
1202 JOIN wst_columns wc ON wcqr.wst_column_id = wc.id
1203 ORDER BY wc.position, wcqr.wst_column_id, r.a;
1204
1205 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1206
1207 * doc/schema/postgresql.sql: Added a new view to select ws of a WST.
1208 To update existing databases:
1209
1210 CREATE VIEW wst_w_values AS
1211 SELECT wcv."position" AS km,
1212 wcv.w AS w,
1213 wc."position" AS column_pos,
1214 w.id AS wst_id
1215 FROM wst_column_values wcv
1216 JOIN wst_columns wc ON wcv.wst_column_id = wc.id
1217 JOIN wsts w ON wc.wst_id = w.id
1218 ORDER BY wcv."position", wc."position";
1219
1220 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1221
1222 flys/issue76
1223
1224 * src/main/java/de/intevation/flys/importer/WstParser.java:
1225 Close gaps between q ranges.
1226
1227 2011-05-20 Ingo Weinzierl <ingo@intevation.de>
1228
1229 Tagged RELEASE 2.3.1
1230
1231 2011-05-13 Ingo Weinzierl <ingo@intevation.de>
1232
1233 Tagged RELEASE 2.3
1234
1235 2011-05-13 Ingo Weinzierl <ingo@intevation.de>
1236
1237 * Changes: Changes for release 2.3 - see Changes file to get to know about
1238 the version numbers of this software.
1239
1240 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1241
1242 * doc/schema/postgresql.sql: Added a column which tells
1243 if a river counts its km up or downwards.
1244 To update existing databases:
1245
1246 ALTER TABLE rivers ADD COLUMN km_up BOOLEAN NOT NULL DEFAULT true;
1247
1248 * src/main/java/de/intevation/flys/model/River.java:
1249 Adjust Hibernate mapping of new column.
1250
1251 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1252
1253 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1254 Fixed flys/issue11 and flys51.
1255
1256 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1257
1258 * src/main/java/de/intevation/flys/importer/ValueKey.java:
1259 Add some unsharp comparison (eps = 1e-6) to avoid
1260 numerical problems.
1261
1262 * src/main/java/de/intevation/flys/importer/IdValueKey.java:
1263 Removed. Not need any longer.
1264
1265 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1266 Use unsharp lookup.
1267
1268 * src/main/java/de/intevation/flys/importer/ImportWst.java,
1269 src/main/java/de/intevation/flys/importer/ImportRiver.java:
1270 Flush more often. Hopefully this reduces hibernate sync
1271 problems?!
1272
1273 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1274
1275 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1276 Fixed silly bug. Set flush mode back to auto because
1277 manual flushing causes some undetermined problems.
1278
1279 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1280
1281 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1282 Do not load _all_ values from discharge tables and
1283 wst columns. This is extremly slow and will lead
1284 to OOM if more rivers are imported. Now only the
1285 last 20 columns und discharge tables are cached.
1286
1287 * src/main/java/de/intevation/flys/importer/ValueKey.java:
1288 New. Key for caching discharge table values and wst
1289 column values.
1290
1291 * src/main/java/de/intevation/flys/importer/IdValueKey.java:
1292 Fixed bug in equals().
1293
1294 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
1295 Removed too eloquent debug output.
1296
1297 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1298
1299 * src/main/java/de/intevation/flys/importer/IdValueKey.java:
1300 Use BigDecimals as representation for the numeric components
1301 which prevents running into unique constraint problems
1302 caused by imprecision.
1303
1304 * src/main/java/de/intevation/flys/importer/ImportRange.java,
1305 src/main/java/de/intevation/flys/importer/ImporterSession.java:
1306 Ranges are now cached globally, too.
1307
1308 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
1309 Improved logging.
1310
1311 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java:
1312 Removed superfluous imports.
1313
1314 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1315
1316 * src/main/java/de/intevation/flys/importer/StaFileParser.java:
1317 Only accept main value types 'Q', 'W', 'D' and 'T' by default.
1318 '-' is not handled any more because it causes too much constraint
1319 problems. You can overwrite the imported type with the
1320 system property flys.backend.main.value.types" (default "QWTD")
1321
1322 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1323 Set session flush mode to manual. Hopefully this improves the
1324 performance a bit.
1325
1326 * src/main/java/de/intevation/flys/importer/ImportWst.java,
1327 src/main/java/de/intevation/flys/importer/ImportGauge.java,
1328 src/main/java/de/intevation/flys/importer/ImportWstColumn.java,
1329 src/main/java/de/intevation/flys/importer/ImportRange.java,
1330 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1331 Improved logging.
1332
1333 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1334
1335 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: Deleted
1336 * src/main/java/de/intevation/flys/importer/IdValueKey.java: Reinserted
1337 here in a more generalized form.
1338
1339 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1340 Cache the discharge table value, too.
1341
1342 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java:
1343 Use the global cache.
1344
1345 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1346
1347 * src/main/java/de/intevation/flys/importer/ImporterSession.java:
1348 New. Centralized caching in the thread local context. Importing
1349 the Elbe leads to OOM because the column values of the
1350 WST files where loaded separately for every file.
1351
1352 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
1353 src/main/java/de/intevation/flys/importer/Importer.java,
1354 src/main/java/de/intevation/flys/importer/ImportAnnotation.java,
1355 src/main/java/de/intevation/flys/importer/ImportWstQRange.java,
1356 src/main/java/de/intevation/flys/importer/ImportWst.java,
1357 src/main/java/de/intevation/flys/importer/ImportMainValue.java,
1358 src/main/java/de/intevation/flys/importer/ImportMainValueType.java,
1359 src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java,
1360 src/main/java/de/intevation/flys/importer/ImportRiver.java,
1361 src/main/java/de/intevation/flys/importer/ImportGauge.java,
1362 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java,
1363 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java,
1364 src/main/java/de/intevation/flys/importer/ImportWstColumn.java,
1365 src/main/java/de/intevation/flys/importer/ImportRange.java,
1366 src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java,
1367 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java,
1368 src/main/java/de/intevation/flys/importer/ImportAttribute.java,
1369 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
1370 Adjusted to use the new global context.
1371
1372 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1373
1374 * doc/schema/postgresql.sql: Dropped constraint which
1375 forces discharge tables to have a unique time interval
1376 for a given gauge and kind.
1377
1378 There are AT files (historical Mosel/Perl/Perl/1967-1981.at
1379 and Mosel/Perl/1967-1981-1.at) which violate this
1380 constraint. Its a technical question to the customer
1381 how to handle these cases.
1382
1383 To adjust existing databases:
1384
1385 ALTER TABLE discharge_tables DROP CONSTRAINT discharge_tables_gauge_id_key;
1386
1387 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1388
1389 * src/main/java/de/intevation/flys/importer/WstParser.java:
1390 There are wst files where column names are not unique.
1391 Make them unique by appending (1), (2) and so on.
1392
1393 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1394
1395 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1396 Import the "HW-Schutzanlagen", too.
1397
1398 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1399
1400 Make import of historical discharge tables work.
1401
1402 * doc/schema/postgresql.sql: Added forgotten column 'description'.
1403
1404 !!! You have to drop your database !!!
1405
1406 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1407 src/main/java/de/intevation/flys/model/DischargeTable.java:
1408 Add the forgotten description property.
1409
1410 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1411 Fixed problems with date recognition.
1412
1413 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1414 Prefix the description of the historical discharge tables
1415 with "Histor.Abflusstafeln".
1416
1417 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
1418 Fixed silly programming error.
1419
1420 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1421
1422 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1423 Inject 'kind' attribute.
1424
1425 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1426 Traverse the "Histor.Abflusstafeln" for the historical
1427 discharge tables. too. TODO: Store them in the database.
1428
1429 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1430 Added convinience constructor to set the kind of the
1431 discharge table.
1432
1433 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1434
1435 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1436 Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte"
1437 in description.
1438
1439 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1440
1441 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1442 Import 'Hochwasser-Marken', too.
1443
1444 * src/main/java/de/intevation/flys/importer/WstParser.java:
1445 Removed superfluous import.
1446
1447 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1448
1449 * src/main/java/de/intevation/flys/importer/WstParser.java:
1450 Ignore lines that contain km positions which were found
1451 before in the same file.
1452
1453 2011-05-05 Ingo Weinzierl <ingo@intevation.de>
1454
1455 * src/main/java/de/intevation/flys/model/River.java: Added a method that
1456 returns all gauges of the river intersected by a given start and end
1457 point.
1458
1459 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1460
1461 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
1462 Forgot to fetch peer from result set.
1463
1464 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1465
1466 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java:
1467 New. Importer model help fetching the database peer.
1468
1469 * src/main/java/de/intevation/flys/model/TimeInterval.java:
1470 Add convinience constructor with start and stop time.
1471
1472 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1473 Attach a time interval to a discharge table if we find one.
1474
1475 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1476 Store the reference to the importer model of the
1477 time interval of the discharge table.
1478
1479 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1480
1481 * src/main/java/de/intevation/flys/importer/AtFileParser.java:
1482 Try to extract time ranges from at files.
1483
1484 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1485
1486 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1487 Parse and store "amtliche Linien" wst files.
1488
1489 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1490
1491 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1492 Parse and store fixation wst files as well.
1493
1494 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1495
1496 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1497 Parse the "zusaetzliche Laengsschnitte", too.
1498
1499 * src/main/java/de/intevation/flys/importer/ImportWst.java:
1500 Add getter/setter for column 'kind'.
1501
1502 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1503
1504 * src/main/java/de/intevation/flys/importer/WstParser.java:
1505 Fixed flys/issue19: Do not take km column in wst file as a water level.
1506
1507 2011-05-02 Ingo Weinzierl <ingo@intevation.de>
1508
1509 * src/main/java/de/intevation/flys/model/Gauge.java: Introduced a 'scale'
1510 that is used to adjust the range of min/max W values.
1511
1512 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1513
1514 * src/main/java/de/intevation/flys/importer/WstParser.java:
1515 Removed superfluous import.
1516
1517 2011-04-20 Ingo Weinzierl <ingo@intevation.de>
1518
1519 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java:
1520 New. This class is used as distinct key of a WstColumnValue - e.g. as
1521 key in a map.
1522
1523 * src/main/java/de/intevation/flys/importer/ImportWst.java: A
1524 WstColumnValue cache is build up while initialization. This cache
1525 contains all WstColumnValues that exist in the database.
1526
1527 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: New
1528 constructor that takes the WstColumnValues cache. It is used to
1529 initialize new ImportWstColumnValue objects.
1530
1531 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java:
1532 Speedup: A ImportWstColumnValue has a WstColumnValues cache that
1533 contains all WstColumnValues existing in the database. This makes it
1534 unnecessary to call an sql statement for each WstColumnValue to
1535 determine its existence in the database.
1536
1537 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1538
1539 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql:
1540 Added a view 'wst_value_table' which aggregates the data
1541 to build w/q value tables.
1542
1543 To update existing databases:
1544
1545 BEGIN;
1546 CREATE VIEW wst_value_table AS
1547 SELECT wcv.position AS position,
1548 w,
1549 (SELECT q
1550 FROM wst_column_q_ranges wcqr
1551 JOIN wst_q_ranges wqr
1552 ON wcqr.wst_q_range_id = wqr.id
1553 JOIN ranges r
1554 ON r.id = wqr.range_id
1555 WHERE wcqr.wst_column_id = wc.id
1556 AND wcv.position BETWEEN r.a AND r.b) AS q,
1557 wc.position AS column_pos,
1558 w.id AS wst_id
1559 FROM wst_column_values wcv
1560 JOIN wst_columns wc
1561 ON wcv.wst_column_id = wc.id
1562 JOIN wsts w
1563 ON wc.wst_id = w.id
1564 ORDER BY wcv.position ASC,
1565 wc.position DESC;
1566 COMMIT;
1567
1568 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1569
1570 * src/main/java/de/intevation/flys/model/Wst.java:
1571 Add forgotten one to many relation Wst -> WstColumn.
1572
1573 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1574
1575 * src/main/java/de/intevation/flys/importer/ImportWst.java,
1576 src/main/java/de/intevation/flys/importer/WstParser.java:
1577 Import of q ranges of wst files was totally broken. :-/
1578 You have to reimport all your data.
1579
1580 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1581
1582 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1583 Forgot kind parameter in peer fetching query.
1584
1585 2011-04-18 Ingo Weinzierl <ingo@intevation.de>
1586
1587 * src/main/java/de/intevation/flys/model/River.java::
1588 Added a new method to determine the gauge based on a given start and end
1589 point of the river.
1590
1591 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1592
1593 * doc/schema/postgresql.sql: Added 'position' column to wst_columns
1594 to allow order them by there column position in the original
1595 wst file.
1596
1597 Update existing database with:
1598
1599 BEGIN;
1600 ALTER TABLE wst_columns ADD COLUMN position int;
1601 UPDATE wst_columns w SET
1602 position = id - (SELECT min(id) FROM wst_columns WHERE wst_id = w.wst_id);
1603 ALTER TABLE wst_columns ADD CONSTRAINT wst_columns_wst_id_position_key
1604 UNIQUE (wst_id, position);
1605 COMMIT;
1606
1607 * src/main/java/de/intevation/flys/model/Wst.java,
1608 src/main/java/de/intevation/flys/model/WstColumn.java:
1609 Adjusted models.
1610
1611 * src/main/java/de/intevation/flys/importer/ImportWst.java,
1612 src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
1613 Adjusted importer.
1614
1615 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1616
1617 * doc/schema/postgresql.sql: Forget ',' in schema.
1618
1619 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1620
1621 * src/main/java/de/intevation/flys/model/Wst.java (determineMinMaxQ):
1622 Fixed index problem when an empty list is returned.
1623
1624 2011-04-15 Ingo Weinzierl <ingo@intevation.de>
1625
1626 * src/main/java/de/intevation/flys/model/Wst.java: A Wst is now able to
1627 return its min and max Q values.
1628
1629 * src/main/java/de/intevation/flys/model/Gauge.java: A Gauge is now able
1630 to return its min and max W values.
1631
1632 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1633
1634 * doc/schema/postgresql.sql: Added new column 'kind' in
1635 discharge tables and wst to distinguish between different
1636 kinds like 'Haupt-WST', 'zusaetzliche Laengsschnitte',
1637 'amtliche Daten' and so on.
1638
1639 Update existing databases with:
1640 BEGIN;
1641 ALTER TABLE discharge_tables ADD COLUMN kind int NOT NULL DEFAULT 0;
1642 ALTER TABLE wsts ADD COLUMN kind int NOT NULL DEFAULT 0;
1643 COMMIT;
1644
1645 * src/main/java/de/intevation/flys/model/DischargeTable.java
1646 src/main/java/de/intevation/flys/model/Wst.java,
1647 src/main/java/de/intevation/flys/importer/ImportWst.java,
1648 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java:
1649 Adjusted the models.
1650
1651 2011-04-15 Ingo Weinzierl <ingo@intevation.de>
1652
1653 * src/main/java/de/intevation/flys/backend/SessionHolder.java: Moved to
1654 this module from flys-artifacts. This is necessary to get access to the
1655 current session in this module as well.
1656
1657 2011-04-14 Ingo Weinzierl <ingo@intevation.de>
1658
1659 * src/main/java/de/intevation/flys/model/River.java: Added a method that
1660 returns the min and max distance of a river.
1661
1662 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1663
1664 * src/**/*.java: Removed trailing whitespace.
1665
1666 2011-03-30 Ingo Weinzierl <ingo@intevation.de>
1667
1668 Tagged RELEASE 0.1
1669
1670 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1671
1672 * src/main/java/de/intevation/flys/model/Range.java:
1673 Forgot to save the last change before commit.
1674
1675 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1676
1677 * src/main/java/de/intevation/flys/model/Range.java:
1678 Added methods to find out if two ranges intersects.
1679
1680 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1681
1682 * src/main/java/de/intevation/flys/model/Gauge.java:
1683 Added an one to many relation to the discharge tables of a gauge.
1684
1685 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1686
1687 Finished import of WSTs.
1688
1689 TODO 1: Speed it up! It takes on a high end machine over 7(!)
1690 minutes only for the data of the Saar.
1691 TODO 2: Double precision floating point representations produced
1692 by the the parsers leed to unique constraint violations
1693 in the backend on a second run. So the import is currently
1694 only working on freshly initialized data bases.
1695 More consequent working with BigDecimal and some
1696 rounding may be of help here.
1697
1698 * src/main/java/de/intevation/flys/model/WstColumnValue.java:
1699 Added convinience constructors.
1700
1701 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java:
1702 Added getPeer() method.
1703
1704 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
1705 Add a list of the ImportWstColumnValues produced by the WST parser.
1706
1707 * src/main/java/de/intevation/flys/importer/WstParser.java: Add
1708 the (km, w) values to the ImportWstColumns.
1709
1710 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1711
1712 * src/main/java/de/intevation/flys/importer/WstParser.java:
1713 Build models for wsts, wst columns and q ranges and
1714 store them in the backend. TODO: store the w values.
1715
1716 * src/main/java/de/intevation/flys/model/WstQRange.java
1717 src/main/java/de/intevation/flys/model/Wst.java,
1718 src/main/java/de/intevation/flys/model/Range.java,
1719 src/main/java/de/intevation/flys/model/WstColumnQRange.java,
1720 src/main/java/de/intevation/flys/model/WstColumn.java:
1721 Added convinience constructors.
1722
1723 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java,
1724 src/main/java/de/intevation/flys/importer/ImportWst.java,
1725 src/main/java/de/intevation/flys/importer/ImportRiver.java,
1726 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java,
1727 src/main/java/de/intevation/flys/importer/ImportWstColumn.java,
1728 src/main/java/de/intevation/flys/importer/ImportRange.java:
1729 Added getPeer() methods.
1730
1731 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1732
1733 * src/main/java/de/intevation/flys/importer/WstParser.java:
1734 The unit extraction in the WST parser of desktop FLYS
1735 is broken! Add a hack here to repair this for our
1736 importer. Desktop FLYS needs a fix, too!
1737
1738 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1739
1740 * src/main/java/de/intevation/flys/importer/WstParser.java:
1741 Ported some stuff ver from WSTSource.java of desktop flys to
1742 parse WST files. TODO: create instances of the import models.
1743
1744 * src/main/java/de/intevation/flys/utils/StringUtil.java:
1745 Copied from desktop flys. Used for some string operations
1746 in WST parser.
1747
1748 * src/main/java/de/intevation/flys/importer/Importer.java:
1749 Added system property 'flys.backend.importer.dry.run'.
1750 Set to true only the parsing is done and no writing
1751 to the backend. Default: false.
1752
1753 * src/main/java/de/intevation/flys/App.java,
1754 src/main/java/de/intevation/flys/model/MainValueType.java:
1755 Removed needless imports.
1756
1757 2011-03-22 Ingo Weinzierl <ingo@intevation.de>
1758
1759 * src/main/java/de/intevation/flys/model/DischargeTableValue.java,
1760 src/main/java/de/intevation/flys/model/DischargeTable.java: Added new
1761 constructors.
1762
1763 * src/main/java/de/intevation/flys/importer/AtFileParser.java: New. This
1764 parser is used to '*.at' files.
1765
1766 * src/main/java/de/intevation/flys/importer/ImportGauge.java: Added code to
1767 import discharge tables.
1768
1769 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java,
1770 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: New.
1771 Helper models for import discharge tables.
1772
1773 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1774
1775 * src/main/java/de/intevation/flys/importer/WstParser.java,
1776 src/main/java/de/intevation/flys/importer/ImportRiver.java:
1777 Added stub for WST parser.
1778
1779 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1780
1781 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java,
1782 src/main/java/de/intevation/flys/importer/ImportWst.java,
1783 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java,
1784 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java,
1785 src/main/java/de/intevation/flys/importer/ImportWstColumn.java:
1786 Added importer helper model stubs for WST imports.
1787
1788 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1789
1790 Second part of parsing/storing main values. Should be finished now.
1791
1792 * src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java,
1793 src/main/java/de/intevation/flys/importer/ImportMainValue.java:
1794 New. Helper models for import main values,
1795
1796 * src/main/java/de/intevation/flys/model/MainValue.java,
1797 src/main/java/de/intevation/flys/model/NamedMainValue.java:
1798 Added convinience constructors.
1799
1800 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1801 Write main values to backend, too.
1802
1803 * src/main/java/de/intevation/flys/importer/StaFileParser.java:
1804 Build importer models for main values.
1805
1806 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java:
1807 Data was called 'value'. Now it is 'name' to fit the
1808 schema.
1809
1810 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1811
1812 * doc/schema/postgresql.sql: Fixed wrong unique constraint.
1813
1814 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1815 Added some logging when storing gauges.
1816
1817 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1818
1819 * src/main/java/de/intevation/flys/model/Gauge.java:
1820 Add forgotten column river_id.
1821
1822 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1823 Small HQL fix.
1824
1825 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1826
1827 * src/main/java/de/intevation/flys/model/Gauge.java:
1828 Added convinience contructor.
1829
1830 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1831 Fixed getPeer() method.
1832
1833 * src/main/java/de/intevation/flys/importer/StaFileParser.java:
1834 Fixed parsing of STA files.
1835
1836 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1837
1838 * src/main/java/de/intevation/flys/importer/ImportRiver.java,
1839 src/main/java/de/intevation/flys/importer/ImportGauge.java:
1840 Propagate river into storing of gauges.
1841
1842 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1843
1844 * src/main/java/de/intevation/flys/importer/Importer.java:
1845 Added code to store rivers not only annotations.
1846
1847 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1848 Added stub code to write gauges.
1849
1850 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1851
1852 First part of parsing main values.
1853
1854 * src/main/java/de/intevation/flys/App.java: Commented out
1855 creation of dummy rivers.
1856
1857 * src/main/java/de/intevation/flys/model/NamedMainValues.java:
1858 Moved to NamedMainValue.
1859
1860 * src/main/java/de/intevation/flys/model/NamedMainValue.java:
1861 New. Formerly NamedMainValues.
1862
1863 * src/main/java/de/intevation/flys/model/MainValue.java:
1864 New. Forgotten part of the model.
1865
1866 * src/main/java/de/intevation/flys/model/MainValueType.java:
1867 Data is String not BigDecimal
1868
1869 * src/main/java/de/intevation/flys/model/Range.java: Removed
1870 contructor with double arguments. Using BigDecimal now.
1871
1872 * src/main/java/de/intevation/flys/importer/PegelGltParser.java:
1873 Propagate BigDecimal usage.
1874
1875 * src/main/java/de/intevation/flys/importer/Importer.java:
1876 Removed needless import. Added TODO
1877
1878 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1879 Parse the dependencies of the gauges, too.
1880
1881 * src/main/java/de/intevation/flys/importer/StaFileParser.java:
1882 New. Parser for STA files.
1883
1884 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1885 Call STA file parser.
1886
1887 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java,
1888 src/main/java/de/intevation/flys/importer/ImportRange.java:
1889 Uses BigDecimal now.
1890
1891 * src/main/java/de/intevation/flys/importer/ImportAttribute.java:
1892 Fixed wrong type cast in equals.
1893
1894 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java:
1895 New. Helper model for importing main value types.
1896
1897 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
1898 Register forgotten MainValue model.
1899
1900 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1901
1902 Store annotations in backend.
1903
1904 * src/main/java/de/intevation/flys/model/Annotation.java:
1905 New convinience constructor.
1906
1907 * src/main/java/de/intevation/flys/model/River.java:
1908 Added toString() method.
1909
1910 * src/main/java/de/intevation/flys/model/Range.java:
1911 Fixed nasty mistake in @OneToOne annotatation.
1912 New convinience constructors.
1913
1914 * src/main/java/de/intevation/flys/importer/ImportPosition.java
1915 src/main/java/de/intevation/flys/importer/ImportAnnotation.java,
1916 src/main/java/de/intevation/flys/importer/ImportRange.java
1917 src/main/java/de/intevation/flys/importer/ImportAttribute.java:
1918 Make storing to backend work. It's a bit too slow. :-/
1919
1920 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1921 Fetch peer from backend. Added method to store annotations.
1922 * src/main/java/de/intevation/flys/importer/Importer.java:
1923 Stored annotations into backend. More eloquent SQL exception
1924 handling.
1925
1926 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1927
1928 * src/main/java/de/intevation/flys/model/Attribute.java,
1929 src/main/java/de/intevation/flys/model/Position.java:
1930 Added convinience constructors.
1931
1932 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
1933 src/main/java/de/intevation/flys/importer/ImportAttribute.java:
1934 Bound them to there backend peers.
1935
1936 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1937
1938 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java:
1939 New. Added parser to read *.KM files.
1940
1941 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
1942 src/main/java/de/intevation/flys/importer/PegelGltParser.java,
1943 src/main/java/de/intevation/flys/importer/ImportRiver.java,
1944 src/main/java/de/intevation/flys/importer/ImportAnnotation.java,
1945 src/main/java/de/intevation/flys/importer/ImportRange.java,
1946 src/main/java/de/intevation/flys/importer/InfoGewParser.java,
1947 src/main/java/de/intevation/flys/importer/ImportAttribute.java:
1948 Adjusted to load the annotations from *.KM files.
1949
1950 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1951
1952 * src/main/java/de/intevation/flys/importer/ImportPosition.java,
1953 src/main/java/de/intevation/flys/importer/ImportRange.java,
1954 src/main/java/de/intevation/flys/importer/ImportAttribute.java,
1955 src/main/java/de/intevation/flys/importer/ImportAnnotation.java:
1956 New helper models for import.
1957
1958 * src/main/java/de/intevation/flys/importer/PegelGltParser.java,
1959 src/main/java/de/intevation/flys/importer/ImportGauge.java:
1960 Use new models.
1961
1962 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1963
1964 * src/main/java/de/intevation/flys/importer/PegelGltParser.java:
1965 New. Parser for PEGEL.GLT files.
1966
1967 * src/main/java/de/intevation/flys/importer/ImportGauge.java:
1968 New. Import model for gauges.
1969
1970 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java:
1971 Removed needless imports.
1972
1973 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
1974 Added method to parse the gauges.
1975
1976 * src/main/java/de/intevation/flys/importer/InfoGewParser.java:
1977 Trigger pegel glt file parsing.
1978
1979 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1980
1981 * src/main/java/de/intevation/flys/importer/Importer.java:
1982 Used thread local pattern to make sharing of session easier.
1983
1984 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1985
1986 * src/main/java/de/intevation/flys/importer/Importer.java:
1987 Fixed error in HQL statement.
1988
1989 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1990
1991 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java:
1992 Commented out a debug block because it leaks the db password.
1993
1994 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
1995
1996 * src/main/java/de/intevation/flys/importer/InfoGewParser.java:
1997 Expose imported rivers.
1998
1999 * src/main/java/de/intevation/flys/importer/InfoGewParser.java:
2000 Store imported rivers into database. Needs testing!
2001
2002 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2003
2004 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
2005 Default connection parameters are now overwritable with
2006 system properties (defaults in brackets):
2007 - user name: flys.backend.user (flys)
2008 - user password: flys.backend.password (flys)
2009 - db dialect: flys.backend.dialect (org.hibernate.dialect.PostgreSQLDialect)
2010 - db driver: flys.backend.driver (org.postgresql.Driver)
2011 - db url: flys.backend.url (jdbc:postgresql://localhost:5432/flys)
2012
2013 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2014
2015 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
2016 Expose createSessionFactory() as public to be usable without
2017 a artifact database running.
2018
2019 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2020
2021 * src/main/java/de/intevation/flys/utils/FileTools.java:
2022 Tools for handling with filenames. Currently there is
2023 a repair(File) method with repairs letter case errors
2024 which is useful when reading windows filenames on a
2025 un*x platform.
2026
2027 * src/main/java/de/intevation/flys/importer/Importer.java:
2028 Standalone app to read data from the file system and
2029 store it in a database. Currently it does not store
2030 anything. It only loads info gew files.
2031
2032 * src/main/java/de/intevation/flys/importer/InfoGewParser.java:
2033 Info gew parser.
2034
2035 * src/main/java/de/intevation/flys/importer/ImportRiver.java:
2036 Helper model of a river used produced by parsing the
2037 info gew files.
2038
2039 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2040
2041 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java:
2042 New. SessionFactoryProvider.getSessionFactory() provides a
2043 SessionFactory to use the Hibernate O/R mapper for the FLYS backend.
2044
2045 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2046
2047 * pom.xml: Added dependency to artifacts-commons to
2048 be able to use the global configuration of the artifact database.
2049
2050 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2051
2052 * src/main/java/de/intevation/flys/App.java: Wire all POJOs
2053 to corresponding factory.
2054
2055 * src/main/java/de/intevation/flys/model/*.java: Generate
2056 all foreign key constraints. TODO: name them correctly
2057 because the machine generated names are ugly and do
2058 not fit the PostgreSQL names.
2059
2060 * doc/schema/postgresql.sql: Small quantifier fix in descriptions
2061 of wst columns.
2062
2063 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2064
2065 * doc/schema/postgresql.sql: Fixed wrong spelled
2066 column references in foreign keys introduces with
2067 last change.
2068
2069 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2070
2071 * src/main/java/de/intevation/flys/model/*.java: Added
2072 column annotations for simple fields. TODO: foreign keys.
2073
2074 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2075
2076 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql:
2077 Fixed inconsistent table names.
2078
2079 * src/main/java/de/intevation/flys/model/*.java: Added
2080 entity and id annotations.
2081
2082 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2083
2084 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql:
2085 Added missing sequences.
2086
2087 * doc/schema/sqlite.sql: Deleted. Not longer supported.
2088
2089 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2090
2091 * doc/schema/postgresql-cleanup.sql: Forgot to add.
2092
2093 * src/main/java/de/intevation/flys/App.java: Use
2094 Apache Commons DBCP as Hibernate connection provide.
2095
2096 * src/main/java/de/intevation/flys/model/River.java:
2097 Added a constructor with string argument. Set the
2098 sequence increment to 1 (eat up 100 at a time before).
2099
2100 * pom.xml: Added PostgreSQL 8.4 driver as runtime dependency.
2101
2102 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2103
2104 * doc/schema/postgresql-cleanup.sql: New. Tear down schema
2105 for a postgres database.
2106
2107 * doc/schema/postgresql.sql: Added squence for
2108 auto generating ids in river table. Cleaned up schema.
2109
2110 * src/main/java/de/intevation/flys/App.java: Simple
2111 test app to interact with hibernate. Needs to be removed
2112 because its only a toy.
2113
2114 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java:
2115 New. Binds Apache Commons to Hibernate.
2116
2117 * pom.xml: Added dependencies to log4j, commons dbcp,
2118 JPA of hibernate.
2119
2120 * src/main/java/de/intevation/flys/model/River.java: Added
2121 JPA annotations.
2122
2123 * src/main/java/de/intevation/flys/model/*.java: Replaced
2124 Long with Integer because column ids are only four bytes wide.
2125
2126 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2127
2128 * doc/schema/sqlite.sql, doc/schema/postgresql.sql: Fixed
2129 smaller issues in ddl.
2130
2131 * src/main/java/de/intevation/flys/model/*.java: Added POJOs
2132 of to be mapped. TODO: Map them!
2133
2134 * pom.xml: Added plugin config for hibernate.
2135
2136 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2137
2138 * pom.xml: Added dependency (and corresponding repository) to
2139 Hibernate Core 3.6.1 Final
2140
2141 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2142
2143 * pom.xml, src/**: Created a new empty maven project:
2144 $ mvn archetype:create \
2145 -DgroupId=de.intevation.flys \
2146 -DartifactId=flys-backend
2147
2148 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2149
2150 * README: New. Some setup instructions.
2151
2152 * doc/schema/postgresql.sql: New. Schema converted to PostgreSQL
2153
2154 * doc/schema/sqlite.sql: Fixed defect foreign key constraints.
2155
2156 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2157
2158 * doc/schema/sqlite.sql: Factorized time intervals out into
2159 a separated table.
2160
2161 2011-01-22 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2162
2163 * contrib/import-kms.py, contrib/import-gew.py: Initial scripts
2164 to import data into SQLite database. They still need some work.
2165
2166 2011-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>:
2167
2168 * doc/schema/sqlite.sql: Added initial schema for
2169 FLYS database.
http://dive4elements.wald.intevation.org