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