Mercurial > dive4elements > river
comparison flys-backend/ChangeLog @ 3344:cb376f48dd37 2.8
merged flys-backend/2.8
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Sep 2012 12:14:36 +0200 |
parents | 8df746f374cc |
children | 09e906487024 |
comparison
equal
deleted
inserted
replaced
3318:dbe2f85bf160 | 3344:cb376f48dd37 |
---|---|
1 2012-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2 | |
3 * src/main/java/de/intevation/flys/model/Gauge.java, | |
4 src/main/java/de/intevation/flys/backend/SpatialInfo.java: | |
5 Removed same package imports. | |
6 | |
7 2012-07-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
8 | |
9 * src/main/java/de/intevation/hibernate/MapResultTransformer.java: | |
10 Added static INSTANCE because its stateless. | |
11 | |
12 2012-07-12 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
13 | |
14 * src/main/java/de/intevation/hibernate/MapResultTransformer.java: | |
15 Strategy to directly transform native SQL results into Maps. | |
16 | |
17 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
18 | |
19 Fix for flys/issue359 | |
20 | |
21 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: | |
22 Removed extension from PRF descriptions. | |
23 | |
24 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
25 | |
26 * doc/schema/postgresql.sql, doc/schema/oracle.sql: | |
27 Added indices for fasten access to cross section points. | |
28 | |
29 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
30 | |
31 Partial fix for flys/issue697 | |
32 | |
33 * doc/schema/oracle.sql: Increased the decimal places of Ws, Qs and Kms to 5. | |
34 | |
35 2012-07-03 Ingo Weinzierl <ingo@intevation.de> | |
36 | |
37 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
38 Set correct connection provider class (its package has changed in the | |
39 last commit). | |
40 | |
41 2012-07-03 Ingo Weinzierl <ingo@intevation.de> | |
42 | |
43 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
44 Fixed broken package declaration. | |
45 | |
46 2012-06-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
47 | |
48 * doc/schema/postgresql.sql, doc/schema/oracle.sql: | |
49 Added views to access the 'Amtlichen Linien'. | |
50 | |
51 2012-06-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
52 | |
53 * src/main/java/de/intevation/**/*.java: Removed trailing whitespace. | |
54 | |
55 2012-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
56 | |
57 Make access to SedDB configurable over conf.xml and provide | |
58 access to sessions. | |
59 | |
60 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
61 Moved FLYS specific stuff out into the concept of credential classes | |
62 which provides the user, password, dialect, driver, url and the | |
63 Hibernate classes to bind. | |
64 | |
65 * src/main/java/de/intevation/flys/backend/Credentials.java: New. | |
66 Abstact class to provide the data needed for the SessionFactoryProvider. | |
67 | |
68 * src/main/java/de/intevation/flys/backend/FLYSCredentials.java: New. | |
69 Extends Credentials to serve the FLYS specific stuff. | |
70 | |
71 * src/main/java/de/intevation/flys/backend/SedDBCredentials.java: New. | |
72 Extends Credentials to serve the SedDB specific stuff. The parameters | |
73 are drawn from conf.xml in the form: | |
74 | |
75 <artifact-database> | |
76 ... | |
77 <seddb-database> | |
78 <user>USER</user> | |
79 <password>PASSWORD</password> | |
80 <driver>DRIVER</driver> | |
81 <url>URL</url> | |
82 <dialect>DIALECT</dialect> | |
83 </seddb-database> | |
84 ... | |
85 </artifact-database> | |
86 | |
87 If absent defaults are: | |
88 - user: seddb | |
89 - password: seddb | |
90 - driver: org.postgresql.Driver | |
91 - url: jdbc:postgresql://localhost:5432/seddb | |
92 - dialect: org.hibernate.dialect.PostgreSQLDialect | |
93 | |
94 Defaults can be overwritten with system properties: | |
95 - user: flys.seddb.user | |
96 - password: flys.seddb.password | |
97 - driver: flys.seddb.driver | |
98 - url: flys.seddb.url | |
99 - dialect: flys.seddb.dialect | |
100 | |
101 * src/main/java/de/intevation/flys/backend/SedDBSessionHolder.java: New. | |
102 Use this if you want to establish a session to the SedDB! | |
103 Works like the SessionHolder. | |
104 | |
105 * src/main/java/de/intevation/flys/backend/SessionHolder.java: | |
106 Add Override annotation. This holder gives you a session | |
107 to the FLYS database. | |
108 | |
109 * src/main/java/de/intevation/flys/App.java: Adjusted. | |
110 | |
111 2012-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
112 | |
113 * src/main/java/de/intevation/seddb/model/*.java: Hibernate access to | |
114 SedDB generated by Eclipse (ugly formatted, but compiles). | |
115 | |
116 2012-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
117 | |
118 * src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java: | |
119 Re-establish cross platform compatibilty again. | |
120 | |
121 2012-06-14 Ingo Weinzierl <ingo@intevation.de> | |
122 | |
123 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: Added the | |
124 missing 'name' property and added a function that returns all | |
125 CrossSectionTracks of a specific river with a specific name. | |
126 | |
127 2012-06-13 Ingo Weinzierl <ingo@intevation.de> | |
128 | |
129 * doc/schema/oracle-minfo.sql, | |
130 doc/schema/oracle-drop-minfo.sql: Added missing river_id column to | |
131 sq_relation table and reordered the drop statements. | |
132 | |
133 * src/main/java/de/intevation/flys/model/SQRelationValue.java, | |
134 src/main/java/de/intevation/flys/model/SQRelation.java: Added missing | |
135 constructors and fixed some minor bugs that occured during import test. | |
136 | |
137 * src/main/java/de/intevation/flys/importer/ImportSQRelationValue.java, | |
138 src/main/java/de/intevation/flys/importer/ImportSQRelation.java: | |
139 Implemented code to store sq relations and values into db. | |
140 | |
141 * src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java: | |
142 Override parse() to retrieve the filename. | |
143 | |
144 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented | |
145 code to store sq relations into db. | |
146 | |
147 2012-06-13 Ingo Weinzierl <ingo@intevation.de> | |
148 | |
149 * src/main/java/de/intevation/flys/importer/ImportSQRelationValue.java, | |
150 src/main/java/de/intevation/flys/importer/ImportSQRelation.java: | |
151 New classes used during the import process of MINFO sq relations. | |
152 | |
153 * src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java: | |
154 New line parser that reads MINFO specifc sq relation files. | |
155 | |
156 * src/main/java/de/intevation/flys/importer/Config.java: Added system | |
157 property to skip parsing sq relations. | |
158 | |
159 "-Dflys.backend.importer.skip.sq.relation" | |
160 | |
161 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse MINFO | |
162 sq relations. | |
163 | |
164 2012-06-12 Ingo Weinzierl <ingo@intevation.de> | |
165 | |
166 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Cleared some | |
167 irritating debug statements. | |
168 | |
169 2012-06-12 Ingo Weinzierl <ingo@intevation.de> | |
170 | |
171 * doc/annotation-types.xml: Added regex to match "Geschiebemesstellen" as | |
172 "Messstelle" type. | |
173 | |
174 * src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java: | |
175 Parse KM files in "../Morphologie/Streckendaten/". On Windows Systems, | |
176 this won't work! | |
177 | |
178 2012-06-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
179 | |
180 * src/main/java/de/intevation/flys/model/FastAnnotations.java: | |
181 Added Override annotation to new NameFilter. | |
182 | |
183 2012-06-11 Raimund Renkert <raimund.renkert@intevation.de> | |
184 | |
185 * src/main/java/de/intevation/flys/model/FastAnnotations.java: | |
186 Added filter for annotation names. | |
187 | |
188 2012-06-08 Felix Wolfsteller <felix.wolfstellre@intevation.de> | |
189 | |
190 * src/main/java/de/intevation/flys/model/FastAnnotations.java: | |
191 Fix comment. | |
192 | |
193 2012-06-08 Felix Wolfsteller <felix.wolfstellre@intevation.de> | |
194 | |
195 * src/main/java/de/intevation/flys/model/SQRelationValue.java: | |
196 Fix hibernaty annotation symptom (make it run again). | |
197 | |
198 2012-06-07 Ingo Weinzierl <ingo@intevation.de> | |
199 | |
200 * doc/schema/oracle-minfo.sql, | |
201 doc/schema/oracle-drop-minfo.sql: Schema additions for MINFO s/q | |
202 relation. | |
203 | |
204 * src/main/java/de/intevation/flys/model/SQRelationValue.java, | |
205 src/main/java/de/intevation/flys/model/SQRelation.java: New model | |
206 classes for MINFO s/q relation. | |
207 | |
208 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
209 Registered new model classes. | |
210 | |
211 2012-06-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
212 | |
213 * src/main/java/de/intevation/flys/model/GaugeLocation.java, | |
214 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
215 Removed superfluous imports. | |
216 | |
217 2012-05-27 Ingo Weinzierl <ingo@intevation.de> | |
218 | |
219 * Tagged module as '2.7'. | |
220 | |
221 2012-05-18 Ingo Weinzierl <ingo@intevation.de> | |
222 | |
223 * src/main/java/de/intevation/flys/model/BedHeightEpoch.java, | |
224 src/main/java/de/intevation/flys/model/BedHeightSingle.java: Added lower | |
225 and upper km to function that returns all singles and epochs for a given | |
226 river. | |
227 | |
228 2012-05-18 Ingo Weinzierl <ingo@intevation.de> | |
229 | |
230 * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java: Fixed | |
231 a typo. | |
232 | |
233 2012-05-18 Ingo Weinzierl <ingo@intevation.de> | |
234 | |
235 * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java, | |
236 src/main/java/de/intevation/flys/model/BedHeightEpochValue.java: Added | |
237 functions to retrieve single and epoch values based on its owner and km | |
238 range. | |
239 | |
240 2012-05-18 Ingo Weinzierl <ingo@intevation.de> | |
241 | |
242 * src/main/java/de/intevation/flys/model/BedHeightEpoch.java, | |
243 src/main/java/de/intevation/flys/model/BedHeightSingle.java: Added | |
244 functions to get singles and epochs by river and by id. | |
245 | |
246 2012-05-15 Ingo Weinzierl <ingo@intevation.de> | |
247 | |
248 * src/main/java/de/intevation/flys/model/FlowVelocityModel.java, | |
249 src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java, | |
250 src/main/java/de/intevation/flys/model/DischargeZone.java: Added static | |
251 functions to retrieve data from database. | |
252 | |
253 2012-05-15 Ingo Weinzierl <ingo@intevation.de> | |
254 | |
255 * src/main/java/de/intevation/flys/model/DischargeZone.java: Added a | |
256 function getDischargeZones() that returns all DischargeZones for a given | |
257 river. | |
258 | |
259 2012-05-10 Ingo Weinzierl <ingo@intevation.de> | |
260 | |
261 * contrib/shpimporter/gauges.py: Search for field 'MPNAAM' and use its | |
262 value as name for the geometry. | |
263 | |
264 * src/main/java/de/intevation/flys/model/GaugeLocation.java: New model | |
265 class for storing locations of gauges. | |
266 | |
267 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
268 Registered GaugeLocation class. | |
269 | |
270 2012-05-10 Ingo Weinzierl <ingo@intevation.de> | |
271 | |
272 * src/main/java/de/intevation/flys/model/HydrBoundary.java, | |
273 src/main/java/de/intevation/flys/model/HydrBoundaryPoly.java: New. | |
274 Hydrological boundaries. | |
275 | |
276 * src/main/java/de/intevation/flys/model/Line.java: Modified signature of | |
277 Line.getLines(). It now also takes the name of a line to retrieve more | |
278 specific lines. | |
279 | |
280 * src/main/java/de/intevation/flys/model/Building.java: Modified signature | |
281 of Building.getBuildings(). It now also takes the name of a building to | |
282 retrieve more specific lines. | |
283 | |
284 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
285 Registered HydrBoundary and HydrBoundaryPoly classes. | |
286 | |
287 2012-05-10 Ingo Weinzierl <ingo@intevation.de> | |
288 | |
289 * contrib/shpimporter/crosssectiontracks.py: Search for 'STATION' field in | |
290 shapefile to extract the current km. | |
291 | |
292 2012-05-08 Ingo Weinzierl <ingo@intevation.de> | |
293 | |
294 * src/main/java/de/intevation/flys/model/Hws.java: The getHws() function | |
295 got a further parameter 'name' to retrieve specific hws only. | |
296 | |
297 | |
298 2012-05-08 Ingo Weinzierl <ingo@intevation.de> | |
299 | |
300 * src/main/java/de/intevation/flys/model/Catchment.java: The | |
301 getCatchments() function got a further parameter 'name' to retrieve | |
302 specific catchments only. | |
303 | |
304 2012-05-08 Ingo Weinzierl <ingo@intevation.de> | |
305 | |
306 * doc/schema/oracle-spatial_idx.sql: Set the geometry type of 'catchments' | |
307 to 'multipolygon'. | |
308 | |
309 * src/main/java/de/intevation/flys/model/Catchment.java: The geometry | |
310 attribute in such instances is now from type 'Geometry'. | |
311 | |
312 2012-05-08 Ingo Weinzierl <ingo@intevation.de> | |
313 | |
314 * doc/schema/import-dems.sql: New. Insert statements to insert dems into | |
315 database. | |
316 | |
317 2012-05-04 Ingo Weinzierl <ingo@intevation.de> | |
318 | |
319 * doc/schema/oracle-drop-spatial.sql, | |
320 doc/schema/oracle-spatial.sql: New relation 'gauge_location' and some | |
321 bugfixes in the drop schema. | |
322 | |
323 * contrib/shpimporter/catchments.py, | |
324 contrib/shpimporter/hws.py, | |
325 contrib/shpimporter/gauges.py: New importers. | |
326 | |
327 * contrib/shpimporter/importer.py: Added a debug statement to improve the | |
328 visibility of the log output. | |
329 | |
330 * contrib/shpimporter/shpimporter.py: Make use of the new importers. | |
331 | |
332 | |
333 2012-05-03 Ingo Weinzierl <ingo@intevation.de> | |
334 | |
335 * doc/schema/oracle-drop-spatial.sql, | |
336 doc/schema/oracle-spatial.sql: Added new relations for hydrological | |
337 boundaries and appended a 'name' field to relations that had no such | |
338 field yet. | |
339 | |
340 * contrib/shpimporter/floodplains.py, | |
341 contrib/shpimporter/boundaries.py: New importers for floodplain and | |
342 hydrological boundaries. | |
343 | |
344 * contrib/shpimporter/lines.py, | |
345 contrib/shpimporter/buildings.py, | |
346 contrib/shpimporter/uesg.py, | |
347 contrib/shpimporter/fixpoints.py, | |
348 contrib/shpimporter/axis.py, | |
349 contrib/shpimporter/crosssectiontracks.py, | |
350 contrib/shpimporter/km.py: Set the 'name' attribute for new features. | |
351 | |
352 * contrib/shpimporter/importer.py: Some bugfixes and improvements: | |
353 geometries are transformed into a destination coordinate system now. | |
354 | |
355 * contrib/shpimporter/shpimporter.py: Use all importers and defined the | |
356 destination srs. | |
357 | |
358 2012-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
359 | |
360 * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java, | |
361 src/main/java/de/intevation/flys/model/CrossSectionPoint.java, | |
362 src/main/java/de/intevation/flys/model/CrossSectionLine.java, | |
363 src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java, | |
364 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
365 Store meassure points of profiles as Doubles not as BigDecimal. | |
366 This should save a lot of memory during the import. | |
367 | |
368 2012-04-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
369 | |
370 * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java, | |
371 src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceValue.java, | |
372 src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java: | |
373 Removed superfluous imports. | |
374 | |
375 2012-04-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
376 | |
377 * doc/schema/postgresql-minfo.sql: Adjusted PostgreSQL port | |
378 to match the Oracle schema. | |
379 | |
380 2012-04-27 Ingo Weinzierl <ingo@intevation.de> | |
381 | |
382 * doc/annotation-types.xml: Adapted annotation typed based on BfG wishes. | |
383 | |
384 2012-04-27 Ingo Weinzierl <ingo@intevation.de> | |
385 | |
386 * doc/schema/oracle-drop.sql: New SQL file to drop WINFO specific db | |
387 schema. | |
388 | |
389 2012-04-27 Ingo Weinzierl <ingo@intevation.de> | |
390 | |
391 * doc/schema/oracle.sql: Made SQL instructions upper case. | |
392 | |
393 2012-04-27 Ingo Weinzierl <ingo@intevation.de> | |
394 | |
395 * doc/schema/oracle-drop-spatial.sql: New statements to drop the whole | |
396 spatial schema. | |
397 | |
398 2012-04-27 Ingo Weinzierl <ingo@intevation.de> | |
399 | |
400 * contrib/shpimporter/lines.py, | |
401 contrib/shpimporter/buildings.py, | |
402 contrib/shpimporter/importer.py, | |
403 contrib/shpimporter/fixpoints.py, | |
404 contrib/shpimporter/axis.py, | |
405 contrib/shpimporter/crosssectiontracks.py, | |
406 contrib/shpimporter/km.py: New classes for importing specific | |
407 shapefiles. Each of this imports defines its target db tablename and a | |
408 directory path to the shapefiles it should import. | |
409 | |
410 * contrib/shpimporter/uesg.py: Some modifications necessary to streamline | |
411 the import process of shapefiles. | |
412 | |
413 * contrib/shpimporter/shpimporter.py: Use all available imports for the | |
414 import process. | |
415 | |
416 2012-04-26 Ingo Weinzierl <ingo@intevation.de> | |
417 | |
418 * doc/schema/oracle-spatial.sql: Repaired broken schema. | |
419 | |
420 2012-04-26 Ingo Weinzierl <ingo@intevation.de> | |
421 | |
422 * src/main/java/de/intevation/flys/importer/Config.java: Added a config | |
423 option to skip parsing MINFO waterlevel differences: | |
424 | |
425 -Dflys.backend.importer.skip.waterlevel.differences=True | |
426 | |
427 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse and | |
428 store MINFO specific waterlevel differences. | |
429 | |
430 2012-04-26 Ingo Weinzierl <ingo@intevation.de> | |
431 | |
432 * src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java: | |
433 New parser for MINFO specific waterlevel differences. | |
434 | |
435 * src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceValue.java, | |
436 src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java, | |
437 src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java: | |
438 New importer classes used during the import process of MINFO specific | |
439 waterlevel differences. | |
440 | |
441 2012-04-26 Ingo Weinzierl <ingo@intevation.de> | |
442 | |
443 * doc/schema/oracle-minfo.sql, | |
444 doc/schema/oracle-drop-minfo.sql: Added a missing constraint to | |
445 'waterlevel_difference' relation. Remove that constraint in | |
446 oracle-drop-minfo.sql. | |
447 | |
448 2012-04-25 Felix Wolfsteller <felix@intevation.de> | |
449 | |
450 * src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java: | |
451 (setValue, setValues): Change setter name to allow hibernate to recognize | |
452 it. | |
453 | |
454 2012-04-24 Ingo Weinzierl <ingo@intevation.de> | |
455 | |
456 * src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java, | |
457 src/main/java/de/intevation/flys/model/WaterlevelDifference.java, | |
458 src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java: | |
459 New model classes for MINFO specific waterlevel differences. | |
460 | |
461 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
462 Registered new model classes. | |
463 | |
464 2012-04-24 Ingo Weinzierl <ingo@intevation.de> | |
465 | |
466 * doc/schema/oracle-minfo.sql, | |
467 doc/schema/oracle-drop-minfo.sql: Improved the schema to store MINFO | |
468 specific waterlevel differences. | |
469 | |
470 2012-04-24 Ingo Weinzierl <ingo@intevation.de> | |
471 | |
472 * src/main/java/de/intevation/flys/model/WaterlevelValue.java: Renamed a | |
473 property ('qRange' -> 'qrange') because there have been problem during the | |
474 import. | |
475 | |
476 * src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java: | |
477 Filled the stub with code. | |
478 | |
479 * src/main/java/de/intevation/flys/importer/ImportWaterlevelValue.java, | |
480 src/main/java/de/intevation/flys/importer/ImportWaterlevelQRange.java, | |
481 src/main/java/de/intevation/flys/importer/ImportWaterlevel.java: Some | |
482 adaptions and missing methods which are required during the import. | |
483 | |
484 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Use the | |
485 correct directory to search for waterlevel files. | |
486 | |
487 2012-04-24 Ingo Weinzierl <ingo@intevation.de> | |
488 | |
489 * doc/schema/oracle-minfo.sql: Small type adaptions in the waterlevel_values | |
490 relation. | |
491 | |
492 * src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java: | |
493 First stub of a parser for MINFO specific waterlevel values. | |
494 | |
495 * src/main/java/de/intevation/flys/importer/Config.java: Added a new config | |
496 option to skip parsing MINFO specifc waterlevel_values: | |
497 | |
498 -Dflys.backend.importer.skip.waterlevels=True | |
499 | |
500 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Added code | |
501 path to start parsing and storing MINFO specific waterlevel values. | |
502 | |
503 2012-04-20 Ingo Weinzierl <ingo@intevation.de> | |
504 | |
505 * src/main/java/de/intevation/flys/importer/ImportWaterlevelValue.java, | |
506 src/main/java/de/intevation/flys/importer/ImportWaterlevelQRange.java, | |
507 src/main/java/de/intevation/flys/importer/ImportWaterlevel.java: New | |
508 importer classes used for MINFO specific waterlevel import. | |
509 | |
510 2012-04-20 Ingo Weinzierl <ingo@intevation.de> | |
511 | |
512 * src/main/java/de/intevation/flys/model/WaterlevelQRange.java, | |
513 src/main/java/de/intevation/flys/model/WaterlevelValue.java, | |
514 src/main/java/de/intevation/flys/model/Waterlevel.java: New model | |
515 classes for MINFO specific waterlevel data. | |
516 | |
517 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
518 Registered new model classes. | |
519 | |
520 2012-04-20 Ingo Weinzierl <ingo@intevation.de> | |
521 | |
522 * doc/schema/oracle-minfo.sql, | |
523 doc/schema/oracle-drop-minfo.sql: Added relations for waterlevels | |
524 specific to MINFO. Note: those waterlevel values are not stored in the | |
525 WINFO specific relations! | |
526 | |
527 2012-04-19 Ingo Weinzierl <ingo@intevation.de> | |
528 | |
529 * doc/schema/oracle-minfo.sql, | |
530 src/main/java/de/intevation/flys/importer/ImportSedimentYield.java, | |
531 src/main/java/de/intevation/flys/model/SedimentYield.java: Added a | |
532 column 'description' to the sediment_yield relation. | |
533 | |
534 * src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java: | |
535 New parser for sediment yield data. | |
536 | |
537 * src/main/java/de/intevation/flys/model/GrainFraction.java: Added constants | |
538 that represent the names of the grain fraction types. | |
539 | |
540 * src/main/java/de/intevation/flys/importer/ImportGrainFraction.java: New | |
541 constructor that takes a name only. | |
542 | |
543 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Improved the | |
544 process of parsing sediment yield files. | |
545 | |
546 2012-04-19 Ingo Weinzierl <ingo@intevation.de> | |
547 | |
548 * src/main/java/de/intevation/flys/importer/Config.java: Added new config | |
549 option to skip parsing sediment yield data: | |
550 | |
551 -Dflys.backend.importer.skip.sediment.yield=true | |
552 | |
553 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared the | |
554 importer to parse sediment yield data. | |
555 | |
556 * src/main/java/de/intevation/flys/importer/ImportSedimentYield.java: | |
557 storeDependencies() now throws SQLExceptions and | |
558 ConstraintViolationExceptions. | |
559 | |
560 2012-04-19 Ingo Weinzierl <ingo@intevation.de> | |
561 | |
562 * src/main/java/de/intevation/flys/importer/ImportGrainFraction.java, | |
563 src/main/java/de/intevation/flys/importer/ImportSedimentYieldValue.java, | |
564 src/main/java/de/intevation/flys/importer/ImportSedimentYield.java: New | |
565 importer classes for importing sediment yield data. | |
566 | |
567 2012-04-18 Ingo Weinzierl <ingo@intevation.de> | |
568 | |
569 * src/main/java/de/intevation/flys/model/SedimentYield.java, | |
570 src/main/java/de/intevation/flys/model/SedimentYieldValue.java, | |
571 src/main/java/de/intevation/flys/model/GrainFraction.java: New model | |
572 classes for sediment yield data. | |
573 | |
574 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
575 Registered new model classes. | |
576 | |
577 2012-04-18 Ingo Weinzierl <ingo@intevation.de> | |
578 | |
579 * doc/schema/oracle-minfo.sql, | |
580 doc/schema/oracle-drop-minfo.sql: Added missing river_id column to | |
581 sediment_yield relation. | |
582 | |
583 2012-04-18 Ingo Weinzierl <ingo@intevation.de> | |
584 | |
585 * src/main/java/de/intevation/flys/model/Floodmaps.java, | |
586 src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java, | |
587 src/main/java/de/intevation/flys/importer/ImportDischargeZone.java: | |
588 Removed superflous imports. | |
589 | |
590 2012-04-18 Ingo Weinzierl <ingo@intevation.de> | |
591 | |
592 * doc/schema/oracle-minfo.sql, | |
593 doc/schema/oracle-drop-minfo.sql: Added relations for storing sediment | |
594 yield values. | |
595 | |
596 2012-04-18 Ingo Weinzierl <ingo@intevation.de> | |
597 | |
598 * doc/schema/oracle-minfo.sql, | |
599 doc/schema/oracle-drop-minfo.sql: The discharge_zone relation has no | |
600 longer a reference to a named main value but stores a lower and upper | |
601 discharge as string. | |
602 | |
603 * src/main/java/de/intevation/flys/model/DischargeZone.java, | |
604 src/main/java/de/intevation/flys/importer/ImportDischargeZone.java: | |
605 Adapted the code to the changes in the db schema. | |
606 | |
607 * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java: | |
608 This parser now reads the meta information properly. | |
609 | |
610 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java: | |
611 Repaired broken HQL statement. | |
612 | |
613 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: | |
614 Log the number of flow velocity model values that have been written into | |
615 database. | |
616 | |
617 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
618 | |
619 * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java: | |
620 New parser for flow velocity measurements. | |
621 | |
622 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java, | |
623 src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java, | |
624 src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, | |
625 src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: | |
626 Fixed broken HQL statements. | |
627 | |
628 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Store flow | |
629 velocity measurements into database after parsing them. | |
630 | |
631 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
632 Registered new model classes for flow velocity measurements. | |
633 | |
634 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
635 | |
636 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java, | |
637 src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java: | |
638 New temp classes used during the import process of flow velocity | |
639 measurements. | |
640 | |
641 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
642 | |
643 * src/main/java/de/intevation/flys/model/FlowVelocityMeasurementValue.java, | |
644 src/main/java/de/intevation/flys/model/FlowVelocityMeasurement.java: New | |
645 model classes for storing flow velocity measurements. | |
646 | |
647 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
648 | |
649 * doc/schema/oracle-minfo.sql, | |
650 doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific | |
651 flow velocity measurements. | |
652 | |
653 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
654 | |
655 * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java: | |
656 New. Parser for model files of MINFO specific flow velocity data. | |
657 | |
658 * doc/schema/oracle-minfo.sql: Added a missing q column to | |
659 flow_velocity_model_values relation. | |
660 | |
661 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, | |
662 src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java: | |
663 Added missing q column. | |
664 | |
665 * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: | |
666 Added setter methods for meta data and an addValue() for adding new | |
667 ImportFlowVelocityModelValues. | |
668 | |
669 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Use | |
670 FlowVelocityModelParser for parsing model data of flow velocity files. | |
671 | |
672 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
673 | |
674 * src/main/java/de/intevation/flys/importer/ImportDischargeZone.java, | |
675 src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, | |
676 src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: | |
677 Temp classes used during the import process of flow velocity data. | |
678 | |
679 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented | |
680 the method that stores flow velocity model data. | |
681 | |
682 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
683 | |
684 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared for | |
685 parsing flow velocity files. | |
686 | |
687 * src/main/java/de/intevation/flys/importer/Config.java: Added a config | |
688 option to skip parsing flow velocity files: | |
689 | |
690 -Dflys.backend.importer.skip.flow.velocity=true | |
691 | |
692 2012-04-17 Ingo Weinzierl <ingo@intevation.de> | |
693 | |
694 * src/main/java/de/intevation/flys/model/FlowVelocityModel.java, | |
695 src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java, | |
696 src/main/java/de/intevation/flys/model/DischargeZone.java: New model | |
697 classes for MINFO specific database relations. | |
698 | |
699 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
700 Registered the new model classes. | |
701 | |
702 2012-04-16 Ingo Weinzierl <ingo@intevation.de> | |
703 | |
704 * doc/schema/oracle-minfo.sql, | |
705 doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific | |
706 flow velocity values. | |
707 | |
708 2012-02-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
709 | |
710 * doc/schema/oracle-minfo.sql: Fixed column unit_id in table depths | |
711 to match type of column id in table units. | |
712 | |
713 * doc/schema/postgresql-minfo.sql: oracle-minfo.sql for a better DBMS. | |
714 | |
715 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
716 | |
717 * src/main/java/de/intevation/flys/model/MorphologicalWidth.java: Added | |
718 annotation for values. | |
719 | |
720 * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java: | |
721 Removed debug output in getPeer() and storeDependencies(). | |
722 | |
723 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
724 | |
725 * src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java: | |
726 New parser for morphological widths files. | |
727 | |
728 * src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: Throw | |
729 constraint violation exceptions. | |
730 | |
731 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse and | |
732 store morphological widths. | |
733 | |
734 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
735 | |
736 * src/main/java/de/intevation/flys/importer/Config.java: Added a config | |
737 option to skip parsing morphological widths: | |
738 | |
739 -Dflys.backend.importer.skip.morphological.width=true | |
740 | |
741 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
742 | |
743 * doc/schema/oracle-minfo.sql: Added a description field to morphological | |
744 width values. | |
745 | |
746 * src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: | |
747 Added new instance variable for descriptions. | |
748 | |
749 * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java, | |
750 src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: New | |
751 temp classes used to store morphological width values during the import. | |
752 | |
753 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
754 | |
755 * doc/schema/oracle-minfo.sql, | |
756 doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific | |
757 morphological width. | |
758 | |
759 * src/main/java/de/intevation/flys/model/MorphologicalWidth.java, | |
760 src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: New | |
761 model classes for morphological width. | |
762 | |
763 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
764 Registered new model classes. | |
765 | |
766 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
767 | |
768 * doc/schema/oracle-minfo.sql: Added a description field to table | |
769 sediment_density. | |
770 | |
771 * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, | |
772 src/main/java/de/intevation/flys/model/SedimentDensity.java: Some | |
773 modifications based on the changes of the schema adaption in last commit. | |
774 | |
775 * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: | |
776 Override parse() of parent class to get the filename. | |
777 | |
778 * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, | |
779 src/main/java/de/intevation/flys/importer/ImportDepth.java, | |
780 src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java: | |
781 Implemented the methods storeDependencies() and getPeer() to save new | |
782 instances into database. | |
783 | |
784 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save all | |
785 ImportSedimentDensity objects to database. | |
786 | |
787 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
788 Registered the new model classes. | |
789 | |
790 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
791 | |
792 * doc/schema/oracle-minfo.sql, | |
793 doc/schema/oracle-drop-minfo.sql: Modified the db schema specific to | |
794 MINFO; replaced some columns. | |
795 | |
796 * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: | |
797 Implemented the method stubs: parse meta data and data values. | |
798 | |
799 * src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, | |
800 src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java: | |
801 Added and replaced some instance variables because the db schema has | |
802 changed. | |
803 | |
804 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
805 | |
806 * src/main/java/de/intevation/flys/importer/parsers/LineParser.java: New. | |
807 An abstract parser that might be used to read a file and handle each | |
808 line contained in the file seperatly. | |
809 | |
810 * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: | |
811 New. Subclasses LineParser. It is able to parse MINFO specific sediment | |
812 density files. NOTE: currently just a stub. | |
813 | |
814 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared to | |
815 read MINFO specific sediment density files. | |
816 | |
817 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
818 | |
819 * src/main/java/de/intevation/flys/importer/Config.java: Added a new | |
820 config option to skip parsing MINFO sediment density values: | |
821 | |
822 -Dflys.backend.importer.skip.sediment.density=true | |
823 | |
824 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
825 | |
826 * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, | |
827 src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, | |
828 src/main/java/de/intevation/flys/importer/ImportDepth.java: New importer | |
829 classes used during MINFO sediment density import. | |
830 | |
831 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
832 | |
833 * doc/schema/oracle-minfo.sql, | |
834 doc/schema/oracle-drop-minfo.sql: Improved the MINFO schema to store | |
835 sediment density values specific to a river and depth. | |
836 | |
837 * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, | |
838 src/main/java/de/intevation/flys/model/SedimentDensity.java, | |
839 src/main/java/de/intevation/flys/model/Depth.java: New model classes | |
840 used to store sediment density values specific to a river and depth. | |
841 | |
842 2012-04-13 Ingo Weinzierl <ingo@intevation.de> | |
843 | |
844 * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java: | |
845 New. An abstract super class for BedHeightSingleParser and | |
846 BedHeightEpochParser. It implements methods for parsing meta data. | |
847 Concrete subclasses need to implements the method for parsing data rows | |
848 only. | |
849 | |
850 * src/main/java/de/intevation/flys/importer/ImportBedHeight.java, | |
851 src/main/java/de/intevation/flys/importer/ImportBedHeightValue.java: New. | |
852 Interfaces that define some major methods which enables the BedHeightParser | |
853 to parse both - single and epoch bed heights. | |
854 | |
855 * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: | |
856 Moved the code for parsing meta data to BedHeightParser which is now the | |
857 parent class. | |
858 | |
859 * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java: | |
860 New. A further subclass of BedHeightParser for parsing MINFO bed heights | |
861 for epochs. | |
862 | |
863 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, | |
864 src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java: | |
865 Made them subclasses of ImportBedHeightValue. | |
866 | |
867 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, | |
868 src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Made | |
869 them subclasses of ImportBedHeight. | |
870 | |
871 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Some | |
872 adjustments to store ImportBedHeight and ImportBedHeightValue instances | |
873 instead of concrete subclasses. | |
874 | |
875 2012-04-12 Ingo Weinzierl <ingo@intevation.de> | |
876 | |
877 * doc/schema/oracle-minfo.sql: Added a link to the river to bed_height_epoch | |
878 table. | |
879 | |
880 * src/main/java/de/intevation/flys/model/BedHeightEpochValue.java, | |
881 src/main/java/de/intevation/flys/model/BedHeightEpoch.java: New model | |
882 classes for MINFO bed height epochs. | |
883 | |
884 * src/main/java/de/intevation/flys/importer/Config.java: Splitted up the | |
885 config option to skip parsing bed heights. Now, we are able to skip single | |
886 and epoch bed heights using the following options: | |
887 | |
888 -Dflys.backend.importer.skip.bed.height.single=true (skip singles) | |
889 -Dflys.backend.importer.skip.bed.height.epoch=true (skip epochs) | |
890 | |
891 * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, | |
892 src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java, | |
893 src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented | |
894 the whole stuff to parse those data. | |
895 | |
896 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
897 Registered the new model classes. | |
898 | |
899 2012-04-12 Ingo Weinzierl <ingo@intevation.de> | |
900 | |
901 * doc/schema/oracle-minfo.sql, | |
902 doc/schema/oracle-drop-minfo.sql: Schema adaptions specific to MINFO bed | |
903 heights. | |
904 | |
905 * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java, | |
906 src/main/java/de/intevation/flys/model/BedHeightType.java, | |
907 src/main/java/de/intevation/flys/model/ElevationModel.java, | |
908 src/main/java/de/intevation/flys/model/LocationSystem.java, | |
909 src/main/java/de/intevation/flys/model/BedHeightSingle.java: New model | |
910 classes for MINFO bed heights. | |
911 | |
912 * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: | |
913 Some logging adjustments and a little bugfix: add BedHeightSingle objects | |
914 after they were parsed; otherwise they are not saved to database. | |
915 | |
916 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, | |
917 src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, | |
918 src/main/java/de/intevation/flys/importer/ImportElevationModel.java, | |
919 src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, | |
920 src/main/java/de/intevation/flys/importer/ImportBedHeightType.java, | |
921 src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented | |
922 storeDependencies() and getPeer(). | |
923 | |
924 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
925 Registered model classes. | |
926 | |
927 2012-04-11 Ingo Weinzierl <ingo@intevation.de> | |
928 | |
929 * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: | |
930 Finished work on parsing meta information and data specific to single bed | |
931 heights. | |
932 | |
933 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, | |
934 src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, | |
935 src/main/java/de/intevation/flys/importer/ImportElevationModel.java, | |
936 src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, | |
937 src/main/java/de/intevation/flys/importer/ImportBedHeightType.java: Some | |
938 new and modified temp storages used during MINFO import. | |
939 | |
940 2012-04-11 Ingo Weinzierl <ingo@intevation.de> | |
941 | |
942 * doc/schema/oracle-minfo.sql, | |
943 doc/schema/oracle-drop-minfo.sql: Some schema adaptions specific to bed | |
944 heights in MINFO. | |
945 | |
946 2012-04-11 Ingo Weinzierl <ingo@intevation.de> | |
947 | |
948 * src/main/java/de/intevation/flys/importer/Config.java: Added new command | |
949 line option to skip parsing bed heights (german "Sohlhoehen"). | |
950 Set "-Dflys.backend.importer.skip.bed.height=true" to skip parsing this | |
951 file type. | |
952 | |
953 * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java, | |
954 src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: | |
955 Initial checkin of parsers for bed heights (single and epoch). | |
956 | |
957 * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, | |
958 src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Temp | |
959 storage for bed heights data used during the import. | |
960 | |
961 * src/main/java/de/intevation/flys/importer/Importer.java: Added an INFO | |
962 statement that signals the start of parsing rivers. | |
963 | |
964 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Collect and | |
965 trigger parsing of bed heights files (placed in 'Morphologie/Sohlhoehen'). | |
966 | |
967 2012-04-11 Ingo Weinzierl <ingo@intevation.de> | |
968 | |
969 * doc/schema/oracle-minfo.sql, | |
970 doc/schema/oracle-drop-minfo.sql: MINFO specific DB schema and sql statements | |
971 to drop MINFO specific stuff. | |
972 | |
973 2012-03-29 Ingo Weinzierl <ingo@intevation.de> | |
974 | |
975 * src/main/java/de/intevation/flys/importer/Config.java: Added a config | |
976 option "flys.backend.importer.infogew.file" to set the path of an | |
977 INFO.gew file. | |
978 | |
979 * src/main/java/de/intevation/flys/importer/Importer.java: Read the path | |
980 to the INFO.gew from the new config option and try to parse it. | |
981 | |
982 2012-03-19 Ingo Weinzierl <ingo@intevation.de> | |
983 | |
984 * doc/schema/oracle-spatial.sql: Set the type of 'lower' and 'upper' column | |
985 of relation 'dem' to NUMBER(19,5). | |
986 | |
987 2012-03-19 Ingo Weinzierl <ingo@intevation.de> | |
988 | |
989 * src/main/java/de/intevation/flys/model/Floodmaps.java: Set geometry type | |
990 to 'Geometry', because Oracle can save POLYGONS and MULTIPOLYGONS in the | |
991 same relation; Hibernate seems unable to load both types. | |
992 | |
993 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
994 Registered missing Floodmaps. | |
995 | |
996 2012-03-16 Ingo Weinzierl <ingo@intevation.de> | |
997 | |
998 * Tagged module as 'pre2.7-2012-03-16'. | |
999 | |
1000 2012-03-16 Ingo Weinzierl <ingo@intevation.de> | |
1001 | |
1002 * doc/schema/oracle-spatial.sql: Repaired broken oracle db schema for | |
1003 relation 'floodmaps'. | |
1004 | |
1005 2012-03-08 Ingo Weinzierl <ingo@intevation.de> | |
1006 | |
1007 * src/main/java/de/intevation/flys/model/Floodmaps.java: New model class for | |
1008 'floodmaps'. | |
1009 | |
1010 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1011 Registered the Floodmaps model class. | |
1012 | |
1013 2012-03-07 Ingo Weinzierl <ingo@intevation.de> | |
1014 | |
1015 * contrib/shpimporter/shpimporter.py, | |
1016 contrib/shpimporter/utils.py, | |
1017 contrib/shpimporter/uesg.py: A python based tool for importing | |
1018 shapefiles into a database. This tool is based on python because it | |
1019 makes use of GDAL OGR to read shapefiles and write features into | |
1020 database. | |
1021 | |
1022 2012-03-07 Ingo Weinzierl <ingo@intevation.de> | |
1023 | |
1024 * doc/schema/postgresql-spatial.sql: Adapted the PostgreSQL schema for | |
1025 floodmaps. | |
1026 | |
1027 2012-03-06 Ingo Weinzierl <ingo@intevation.de> | |
1028 | |
1029 * doc/schema/postgresql-spatial.sql, | |
1030 doc/schema/oracle-spatial.sql: Added new relations for existing | |
1031 floodmaps (currently tested for PostgreSQL only!). | |
1032 | |
1033 2012-03-06 Ingo Weinzierl <ingo@intevation.de> | |
1034 | |
1035 * src/main/java/de/intevation/flys/model/Wst.java: Adapted method call of | |
1036 Log4J logger 'warning()' -> 'warn()'. | |
1037 | |
1038 2012-03-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1039 | |
1040 Fix or workaround flys/issue632 . | |
1041 | |
1042 * src/main/java/de/intevation/flys/model/Wst.java: Avoid NPE when | |
1043 trying to get min/max q values. | |
1044 | |
1045 2012-02-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1046 | |
1047 * src/main/java/de/intevation/flys/model/DischargeTable.java: | |
1048 The list of DischargeTableValue is now sorted by Q. | |
1049 | |
1050 2012-02-09 Ingo Weinzierl <ingo@intevation.de> | |
1051 | |
1052 * src/main/java/de/intevation/flys/model/Gauge.java: Added a method | |
1053 getMasterDischargeTable() to retrieve the discharge table with kind 0. | |
1054 | |
1055 2012-02-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1056 | |
1057 * src/main/java/de/intevation/flys/model/River.java | |
1058 (getGaugeDatumsKMs,queryGaugeDatumsKMs): renamed to avoid hibernate | |
1059 running into trouble finding db-mapping for type Map for | |
1060 what looks like a 'getter' of GaugeDatumsKMs. | |
1061 | |
1062 2012-02-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1063 | |
1064 * src/main/java/de/intevation/flys/model/River.java(getGaugeDatumsKMs): | |
1065 New method to build a map of gauge stattion km to | |
1066 the datums (PNP) of the gauge. Useful look if a km | |
1067 is a gauge station. | |
1068 | |
1069 2012-01-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1070 | |
1071 * src/main/java/de/intevation/flys/model/FastAnnotations.java: | |
1072 New. Fetches all informations of annotations in one go for | |
1073 a river. Useful to speed up annotation handling. | |
1074 | |
1075 2012-01-18 Ingo Weinzierl <ingo@intevation.de> | |
1076 | |
1077 * src/main/java/de/intevation/flys/model/Gauge.java: Added a function that | |
1078 returns a Gauge based on its official number. | |
1079 | |
1080 2012-01-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1081 | |
1082 * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java: | |
1083 New. Cacheable representation of the cross section line. | |
1084 | |
1085 * src/main/java/de/intevation/flys/model/CrossSectionLine.java: | |
1086 Add a new isValid() method. | |
1087 | |
1088 * src/main/java/de/intevation/flys/model/CrossSection.java: | |
1089 Added method getFastLines() to fetch the lines (FastCrossSectionLines) | |
1090 directly with a single SQL statement and without expensive | |
1091 intermediate representations. | |
1092 | |
1093 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1094 | |
1095 * src/main/java/de/intevation/flys/model/CrossSection.java(getLines): | |
1096 Added method to fetch the lines of a cross section in a given interval. | |
1097 Useful to have chunked access to the lines. | |
1098 | |
1099 2012-01-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1100 | |
1101 * src/main/java/de/intevation/flys/model/CrossSectionLine.java | |
1102 (fetchCrossSectionLinesPoints): Simplified and prevent reallocations. | |
1103 | |
1104 2012-01-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1105 | |
1106 * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: | |
1107 Introduced boolean system property 'flys.backend.sta.parse.gauge.numbers' | |
1108 default: false. If set the official number is parsed out of | |
1109 the first line of the STA files. This leads to problems with the | |
1110 data of the Elbe river. | |
1111 | |
1112 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Removed | |
1113 superfluous import. | |
1114 | |
1115 2012-01-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1116 | |
1117 * doc/schema/postgresql-spatial.sql: Fixed table hws. | |
1118 | |
1119 2012-01-05 Ingo Weinzierl <ingo@intevation.de> | |
1120 | |
1121 * src/main/java/de/intevation/flys/model/RiverAxis.java: The method | |
1122 getRiverAxis() now returns a list of RiverAxis objects. There is a | |
1123 modeling problem (see comment in the header of the class) which should | |
1124 be fixed! | |
1125 | |
1126 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Adapted the | |
1127 code based on the modified signature in RiverAxis. | |
1128 | |
1129 2012-01-03 Ingo Weinzierl <ingo@intevation.de> | |
1130 | |
1131 * src/main/java/de/intevation/flys/model/Wst.java: Added a method | |
1132 determineMinMaxQFree() that determines the min/max Qs at a given | |
1133 kilometer. | |
1134 | |
1135 2012-01-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1136 | |
1137 * doc/schema/postgresql.sql: Remove 'NOT NULL' constraint from | |
1138 gauges.range_id because there are gauges which don't have | |
1139 a 'Gueltigkeitsbereich' | |
1140 | |
1141 To adjust existing PostgreSQL databases use: | |
1142 | |
1143 ALTER TABLE gauges ALTER COLUMN range_id DROP NOT NULL; | |
1144 | |
1145 * src/main/java/de/intevation/flys/model/River.java: Handle | |
1146 null references to 'Gueltigkeitsbereiche'. | |
1147 | |
1148 2011-12-28 Ingo Weinzierl <ingo@intevation.de> | |
1149 | |
1150 * src/main/java/de/intevation/flys/model/Wst.java: Added a method | |
1151 determineMinMaxQ(double double) to be able to determine the Q range of a | |
1152 WST without having a Range object. | |
1153 | |
1154 2011-12-19 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
1155 | |
1156 * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: | |
1157 Parse the official 'Pegelnummer' out of the STA files, too. | |
1158 | |
1159 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
1160 Adjusted import model. | |
1161 | |
1162 * src/main/java/de/intevation/flys/model/Gauge.java: Make the | |
1163 official gauge number accessible via Hibernate. | |
1164 | |
1165 * doc/schema/postgresql.sql, doc/schema/oracle.sql: Added | |
1166 an official_number to the gauges table. | |
1167 | |
1168 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>: | |
1169 | |
1170 * doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 | |
1171 (GK3) coordinates. | |
1172 | |
1173 2011-11-30 Bjoern Schilberg <bjoern.schilberg@intevation.de>: | |
1174 | |
1175 * doc/schema/oracle-spatial.sql: Adjust extent to the extent of germany | |
1176 and srs to 31467 in USER_SDO_GEOM_METADATA. | |
1177 | |
1178 2011-11-29 Bjoern Schilberg <bjoern.schilberg@intevation.de>: | |
1179 | |
1180 * doc/schema/oracle_create_user.sql: Fixed notation of the table in the | |
1181 alter statement. | |
1182 | |
1183 2011-11-18 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
1184 | |
1185 Fixed flys/issue415 | |
1186 | |
1187 * doc/schema/oracle.sql: Increased precision of a and b in ranges. | |
1188 | |
1189 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
1190 | |
1191 * src/main/java/de/intevation/flys/model/Building.java, | |
1192 src/main/java/de/intevation/flys/model/Fixpoint.java: Added functions | |
1193 that return a list of Buildings/Fixpoints for a given river. | |
1194 | |
1195 2011-11-10 Ingo Weinzierl <ingo@intevation.de> | |
1196 | |
1197 * doc/schema/oracle-spatial.sql, | |
1198 doc/schema/postgresql-spatial.sql: Adapted the "kind" field of "lines" | |
1199 relation (Int -> Varchar). | |
1200 | |
1201 * doc/schema/oracle-spatial_idx.sql: Added missing spatial index for | |
1202 "lines" relation. | |
1203 | |
1204 * src/main/java/de/intevation/flys/model/Line.java: Added a function that | |
1205 returns all lines of a given river. | |
1206 | |
1207 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
1208 | |
1209 * src/main/java/de/intevation/flys/model/Catchment.java: New. A model for | |
1210 the 'catchment' relation. | |
1211 | |
1212 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1213 Registered the Catchment model. | |
1214 | |
1215 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
1216 | |
1217 * doc/schema/postgresql-spatial.sql: Synced "hws" relation with oracle | |
1218 schema. | |
1219 | |
1220 * src/main/java/de/intevation/flys/model/Hws.java: New. A model for the | |
1221 "hws" relation. | |
1222 | |
1223 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1224 Registered the Hws model. | |
1225 | |
1226 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
1227 | |
1228 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1229 Added methods that return information about the database connection used | |
1230 by a concrete SessionFactoryImpl. | |
1231 | |
1232 2011-11-09 Ingo Weinzierl <ingo@intevation.de> | |
1233 | |
1234 * src/main/java/de/intevation/flys/model/Floodplain.java: Changed the | |
1235 geometry type from MultiPolygon to Polygon. | |
1236 | |
1237 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1238 Added a function that returns the db driver of a given | |
1239 SessionFactoryImpl instance. | |
1240 | |
1241 2011-11-01 Ingo Weinzierl <ingo@intevation.de> | |
1242 | |
1243 * src/main/java/de/intevation/flys/model/RiverAxisKm.java: New. Model class | |
1244 for 'river_axes_km' relation. | |
1245 | |
1246 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1247 Added mapping for RiverAxisKm. | |
1248 | |
1249 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1250 | |
1251 * doc/schema/oracle_create_user.sql: | |
1252 Added explizit TABLESPACE definition for the user. | |
1253 | |
1254 2011-10-25 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1255 | |
1256 * doc/schema/oracle_create_user.sql: | |
1257 Adjusted oracle_create_user.sql script. Added USER SQL snippet to change | |
1258 tablespace to users. | |
1259 | |
1260 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
1261 | |
1262 * src/main/java/de/intevation/flys/utils/DateGuesser.java: | |
1263 New. Date guesser from desktop FLYS. | |
1264 | |
1265 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: | |
1266 Try to parse the name of a WST column as a date and store | |
1267 the date into the database | |
1268 | |
1269 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
1270 Added code to store the date of the column in the database. | |
1271 | |
1272 2011-10-24 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1273 | |
1274 * doc/schema/postgresql-spatial.sql: | |
1275 Adjusted geometry type for floodplain and hws in AddGeometryColumn. | |
1276 | |
1277 2011-10-19 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1278 | |
1279 * doc/schema/oracle.sql: | |
1280 Added missing views (wst_value_table,wst_w_values,wst_q_values). | |
1281 | |
1282 2011-10-18 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1283 | |
1284 * doc/schema/oracle.sql: | |
1285 Removed all CREATE OR REPLACE TRIGGER statements. | |
1286 | |
1287 2011-10-17 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1288 | |
1289 * doc/schema/oracle.sql: | |
1290 Adjusted NUMBER format for units, positions and cross_section_points tables. | |
1291 | |
1292 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1293 | |
1294 * doc/schema/oracle.sql: | |
1295 Fix errors. | |
1296 | |
1297 2011-10-10 Bjoern Schilberg <bjoern.schilberg@intevation.de> | |
1298 | |
1299 * doc/schema/oracle.sql: | |
1300 Adjust oracle schema [I382]. | |
1301 | |
1302 2011-10-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1303 | |
1304 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
1305 src/main/java/de/intevation/flys/importer/ImportUnit.java: | |
1306 Removed obsolete imports. | |
1307 | |
1308 2011-10-05 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
1309 | |
1310 * ChangeLog: Added database update statements. | |
1311 | |
1312 To update existing databases: | |
1313 | |
1314 BEGIN; | |
1315 CREATE SEQUENCE UNITS_ID_SEQ; | |
1316 CREATE TABLE units ( | |
1317 id int PRIMARY KEY NOT NULL, | |
1318 name VARCHAR(32) NOT NULL UNIQUE | |
1319 ); | |
1320 ALTER TABLE rivers ADD COLUMN wst_unit_id int REFERENCES units(id); | |
1321 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NN + m'); | |
1322 INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NHN + m'); | |
1323 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NHN + m') WHERE name = 'Elbe'; | |
1324 UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NN + m') WHERE name <> 'Elbe'; | |
1325 ALTER TABLE rivers ALTER COLUMN wst_unit_id SET NOT NULL; | |
1326 COMMIT; | |
1327 | |
1328 2011-10-05 Ingo Weinzierl <ingo@intevation.de> | |
1329 | |
1330 * contrib/dump-schema.sh: New. A small shell script that dumps the | |
1331 database schema of a given database to SQL. | |
1332 | |
1333 * pom.xml: Added dependency for hibernate-spatial-oracle stuff. | |
1334 | |
1335 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1336 | |
1337 * doc/schema/postgresql.sql: Removed unit column from wsts; added a | |
1338 wst_unit_id column to rivers. We decided to support a single elevation | |
1339 model for the whole river. | |
1340 | |
1341 * src/main/java/de/intevation/flys/model/River.java: Added a WstUnit | |
1342 column. | |
1343 | |
1344 * src/main/java/de/intevation/flys/model/Wst.java: Removed the Unit | |
1345 column. | |
1346 | |
1347 * src/main/java/de/intevation/flys/importer/ImportWst.java: Provide a | |
1348 getUnit() method that allows querying the elevation unit for this wst. | |
1349 | |
1350 * src/main/java/de/intevation/flys/importer/ImportUnit.java: Removed | |
1351 storeDependencies(). | |
1352 | |
1353 * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save the | |
1354 Unit of the wst file or a default one into database before all other | |
1355 dependencies as well as the river itself is saved to database. | |
1356 | |
1357 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1358 | |
1359 * doc/schema/postgresql.sql: Added a "units" table. | |
1360 | |
1361 * src/main/java/de/intevation/flys/model/Unit.java: New. Model class that | |
1362 represents a unit. | |
1363 | |
1364 * src/main/java/de/intevation/flys/importer/ImportUnit.java: New. Model | |
1365 class that is used to import units. | |
1366 | |
1367 * src/main/java/de/intevation/flys/model/Wst.java: A Wst stores a Unit | |
1368 which references "units" table now. | |
1369 | |
1370 * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: Set | |
1371 units which have already been parsed on Wsts. | |
1372 | |
1373 * src/main/java/de/intevation/flys/importer/ImportWst.java: Added setter | |
1374 method for Units and call storeDependencies() for ImportUnits. | |
1375 | |
1376 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1377 Registered new model class Unit. | |
1378 | |
1379 2011-10-04 Ingo Weinzierl <ingo@intevation.de> | |
1380 | |
1381 flys/issue333 (W-INFO / Berechnung Wasserspiegellage, Zuordnung Bezugspegel) | |
1382 | |
1383 * src/main/java/de/intevation/flys/model/River.java: Modified | |
1384 determination of gauge based on a km range. River.determineGauge(double, | |
1385 double) will now return the gauge which matches the start km. | |
1386 | |
1387 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1388 | |
1389 * src/main/java/de/intevation/flys/utils/StringUtil.java: | |
1390 (wWrap): New method (extracted from WaterlevelSelectState). | |
1391 | |
1392 2011-09-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1393 | |
1394 * src/main/java/de/intevation/flys/utils/StringUtil.java: | |
1395 (unbracket): New method (extracted from WaterlevelSelectState). | |
1396 | |
1397 2011-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1398 | |
1399 * src/main/java/de/intevation/flys/model/CrossSectionLine.java: | |
1400 Moved some logic from cross section demo app to this model. | |
1401 | |
1402 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | |
1403 | |
1404 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: | |
1405 Added new function that the nearest CrossSectionTrack of a river to a | |
1406 given kilometer. | |
1407 | |
1408 2011-09-23 Bjoern Schilberg <bjoern@intevation.de> | |
1409 | |
1410 * doc/schema/postgresql-spatial.sql: | |
1411 Added missing river_axes_km schema. | |
1412 * doc/schema/oracle-spatial.sql: | |
1413 Added missing dem and lines schema. | |
1414 | |
1415 2011-09-22 Bjoern Schilberg <bjoern@intevation.de> | |
1416 | |
1417 * doc/schema/postgresql-spatial.sql, doc/schema/oracle-spatial.sql: | |
1418 Harmonized oracle and postgresql spatial schema. | |
1419 | |
1420 2011-09-22 Bjoern Schilberg <bjoern@intevation.de> | |
1421 | |
1422 * doc/schema/oracle-spatial.sql: Harmonized Extent for Saar and Mosel. Some cleanups. | |
1423 | |
1424 2011-09-22 Ingo Weinzierl <ingo@intevation.de> | |
1425 | |
1426 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1427 Added the possibility to enable JMX (/MBean) support for hibernate. By | |
1428 default, this support is NOT enabled. To enable JMX support for | |
1429 hibernate, set the system property "flys.backend.enablejmx=true". | |
1430 | |
1431 2011-09-20 Bjoern Schilberg <bjoern@intevation.de> | |
1432 | |
1433 * doc/schema/oracle_create_user.sql: Added right to create views. | |
1434 | |
1435 2011-09-20 Bjoern Schilberg <bjoern@intevation.de> | |
1436 | |
1437 * doc/schema/oracle-spatial.sql: Generalized oracle spatial schema. | |
1438 | |
1439 2011-09-19 Ingo Weinzierl <ingo@intevation.de> | |
1440 | |
1441 Tagged RELEASE 2.5 | |
1442 | |
1443 * Changes: Prepared changes for release. | |
1444 | |
1445 2011-09-16 Ingo Weinzierl <ingo@intevation.de> | |
1446 | |
1447 * src/main/java/de/intevation/flys/model/DGM.java: Added function to query | |
1448 a DGM by Id. | |
1449 | |
1450 2011-09-15 Bjoern Schilberg <bjoern@intevation.de> | |
1451 | |
1452 * pom.xml: Removed oracle dependency. | |
1453 | |
1454 2011-09-15 Bjoern Schilberg <bjoern@intevation.de> | |
1455 | |
1456 * doc/schema/oracle.sql: Added inital oracle schema. | |
1457 | |
1458 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1459 | |
1460 * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql | |
1461 script. | |
1462 | |
1463 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1464 | |
1465 * doc/schema/oracle-spatial.sql: Deactivated spatial indexes. | |
1466 | |
1467 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1468 | |
1469 * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql | |
1470 script. | |
1471 | |
1472 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1473 | |
1474 * doc/schema/oracle-spatial.sql: Added schema floodplain. | |
1475 | |
1476 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1477 | |
1478 * doc/schema/oracle-spatial.sql: Added schema hws. | |
1479 | |
1480 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1481 | |
1482 * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks. | |
1483 | |
1484 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1485 | |
1486 * doc/schema/oracle-spatial.sql: Added schema river_axes. | |
1487 | |
1488 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1489 | |
1490 * doc/schema/oracle-spatial.sql: Added schema fixpoints. | |
1491 | |
1492 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1493 | |
1494 * doc/schema/oracle-spatial.sql: Added schema buildings. | |
1495 | |
1496 2011-09-14 Bjoern Schilberg <bjoern@intevation.de> | |
1497 | |
1498 * doc/schema/oracle-spatial.sql: Fixed table river_axes_km. | |
1499 | |
1500 2011-09-13 Bjoern Schilberg <bjoern@intevation.de> | |
1501 | |
1502 * doc/schema/oracle-spatial.sql: Added initial oracle schemas. | |
1503 | |
1504 2011-09-12 Bjoern Schilberg <bjoern@intevation.de> | |
1505 | |
1506 * doc/schema/postgresql-spatial.sql: Added initial schemas for | |
1507 Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr. | |
1508 Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp, | |
1509 BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp, | |
1510 Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung, | |
1511 Hydrologie/UeSG/Messung | |
1512 | |
1513 2011-09-02 Ingo Weinzierl <ingo@intevation.de> | |
1514 | |
1515 * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema. | |
1516 Auto-Increment is realized through SERIALs now. | |
1517 | |
1518 * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has | |
1519 been renamed to 'dem' (before 'dgm'). | |
1520 | |
1521 2011-09-01 Hans Plum <hans@intevation.de> | |
1522 | |
1523 * doc/schema/postgresql-spatial.sql: | |
1524 Hint for unifying table names: dgm -> dem | |
1525 | |
1526 2011-09-01 Hans Plum <hans@intevation.de> | |
1527 | |
1528 * doc/schema/postgresql-spatial.sql: | |
1529 Added mappings to existing data in file system (based on | |
1530 river Saar); added TODOs for missing tables/mappings | |
1531 | |
1532 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
1533 | |
1534 * doc/schema/postgresql-spatial.sql: New relation for floodplains (german | |
1535 "Talaue"). | |
1536 | |
1537 * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class | |
1538 that represents a floodplain. | |
1539 | |
1540 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1541 Registered the Floodplain mapping. | |
1542 | |
1543 2011-08-31 Ingo Weinzierl <ingo@intevation.de> | |
1544 | |
1545 * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that | |
1546 no data of the DGM is stored in this relation, but only the file path to | |
1547 the DGM file. | |
1548 | |
1549 * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides | |
1550 information for a DGM (km range and file path). | |
1551 | |
1552 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1553 Registered the DGM. | |
1554 | |
1555 2011-08-30 Ingo Weinzierl <ingo@intevation.de> | |
1556 | |
1557 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New | |
1558 static function to retrieve all CrossSectionTracks of a specific river. | |
1559 | |
1560 2011-08-25 Ingo Weinzierl <ingo@intevation.de> | |
1561 | |
1562 * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to | |
1563 artifacts-common module. | |
1564 | |
1565 * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java, | |
1566 src/main/java/de/intevation/flys/importer/parsers/PRFParser.java, | |
1567 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, | |
1568 src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java, | |
1569 src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java, | |
1570 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1571 src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted | |
1572 imports of FileTools. | |
1573 | |
1574 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
1575 | |
1576 * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues) | |
1577 (setMainValues): | |
1578 New method and mapping to get/set MainValues of a Gauge. Essentially | |
1579 developed by Sascha L. Teichmann. | |
1580 | |
1581 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
1582 | |
1583 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1584 Reverted the default db dialect to PostgreSQL - this has been changed to | |
1585 PostGIS by accident. | |
1586 Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to | |
1587 use the PostGIS stuff. | |
1588 | |
1589 2011-08-22 Ingo Weinzierl <ingo@intevation.de> | |
1590 | |
1591 * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function | |
1592 that returns the RiverAxis for a given River. | |
1593 | |
1594 * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new | |
1595 function of RiverAxis to retrieve the RiverAxis. | |
1596 | |
1597 2011-08-18 Ingo Weinzierl <ingo@intevation.de> | |
1598 | |
1599 * doc/schema/postgresql-spatial.sql: The PostGIS database schema for | |
1600 FLYS spatial data. | |
1601 | |
1602 * src/main/java/de/intevation/flys/model/CrossSectionTrack.java, | |
1603 src/main/java/de/intevation/flys/model/RiverAxis.java, | |
1604 src/main/java/de/intevation/flys/model/Line.java, | |
1605 src/main/java/de/intevation/flys/model/Building.java, | |
1606 src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that | |
1607 represent FLYS spatial data. | |
1608 | |
1609 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1610 Registered model classes. | |
1611 | |
1612 * pom.xml: Added dependencies to HibernateSpatial and PostGIS. | |
1613 | |
1614 * src/main/java/de/intevation/flys/backend/SpatialInfo.java, | |
1615 contrib/spatial-info.sh: A small demo application that prints out some | |
1616 information about spatial data of specific rivers. Modify the system | |
1617 property -Dflys.backend.spatial.river to get information of a river of | |
1618 your choice. | |
1619 | |
1620 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1621 | |
1622 Re-enabled Hibernate schema dumps. | |
1623 | |
1624 * src/main/java/de/intevation/flys/App.java: Removed old code | |
1625 and use new SessionFactoryProvider infrastructure. | |
1626 | |
1627 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1628 Added methods to create db configurations without opening them. | |
1629 Useful for introspection only purposes. | |
1630 | |
1631 2011-07-31 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1632 | |
1633 * pom.xml: Bumped Apache DBCP up to 1.4 to use the same version | |
1634 as artifact database. | |
1635 | |
1636 2011-07-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1637 | |
1638 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
1639 Make use of the LRU cache from artifacts common. | |
1640 | |
1641 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1642 | |
1643 * doc/schema/postgresql.sql: Added missing foreign key contraint on hyks table. | |
1644 To update existing databases: | |
1645 | |
1646 ALTER TABLE hyks ADD CONSTRAINT hyks_river_id_fkey FOREIGN KEY (river_id) REFERENCES rivers(id); | |
1647 | |
1648 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1649 | |
1650 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
1651 Check if zone coordinates in HYKs are swapped and warn the user. | |
1652 | |
1653 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1654 | |
1655 * src/main/java/de/intevation/flys/model/HYK.java | |
1656 src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, | |
1657 src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
1658 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
1659 src/main/java/de/intevation/flys/importer/ImportHYK.java: | |
1660 Various small fixes and some extra logging. | |
1661 | |
1662 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1663 | |
1664 * src/main/java/de/intevation/flys/importer/Config.java: New. | |
1665 Central singleton to configure the Importer. | |
1666 Uses system properties by now: | |
1667 | |
1668 flys.backend.importer.dry.run: boolean | |
1669 default false. true: don't write to database. | |
1670 | |
1671 flys.backend.importer.annotation.types: String | |
1672 default unset. Filename of annotation type classifications. | |
1673 | |
1674 flys.backend.importer.skip.gauges: boolean | |
1675 default: false. true: don't parse/store *.glt, *.sta files | |
1676 | |
1677 flys.backend.importer.skip.annotations: boolean | |
1678 default: false. true: don't parse/store *.km files | |
1679 | |
1680 flys.backend.importer.skip.prfs: boolean | |
1681 default: false. true: don't parse/store *.prf files | |
1682 | |
1683 flys.backend.importer.skip.hyks: boolean | |
1684 default: false. true: don't parse/store *.hyk files | |
1685 | |
1686 flys.backend.importer.skip.wst: boolean | |
1687 default: false. true: don't parse/store river wst files | |
1688 | |
1689 flys.backend.importer.skip.extra.wsts: boolean | |
1690 default: false. true: don't parse/store extra *.zus, *.wst files | |
1691 | |
1692 flys.backend.importer.skip.fixations: boolean | |
1693 default: false. true: don't parse/store fixation *.wst files | |
1694 | |
1695 flys.backend.importer.skip.official.lines: boolean | |
1696 default: false. true: don't parse/store 'amtliche Linien' *.wst files | |
1697 | |
1698 flys.backend.importer.skip.flood.water: boolean | |
1699 default: false. true: don't parse/store 'HW-Marken' *.wst files | |
1700 | |
1701 flys.backend.importer.skip.flood.protection: boolean | |
1702 default: false. true: don't parse/store 'HW-Schutzanlagen' *.wst files | |
1703 | |
1704 2011-07-18 Ingo Weinzierl <ingo@intevation.de> | |
1705 | |
1706 * src/main/java/de/intevation/flys/model/HYKEntry.java: Fixed OrderBy | |
1707 clause. | |
1708 | |
1709 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1710 | |
1711 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
1712 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, | |
1713 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
1714 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
1715 src/main/java/de/intevation/flys/importer/ImportHYK.java: | |
1716 Store HYK data structures to database. Needs testing. | |
1717 | |
1718 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1719 | |
1720 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1721 Parse the HYKs from the importer. TODO: Store them in database. | |
1722 | |
1723 2011-07-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1724 | |
1725 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
1726 Create data structures while parsing. | |
1727 | |
1728 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
1729 src/main/java/de/intevation/flys/importer/ImportHYK.java: Added | |
1730 getters/setters to ease model wiring. | |
1731 | |
1732 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1733 | |
1734 * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, | |
1735 src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, | |
1736 src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, | |
1737 src/main/java/de/intevation/flys/importer/ImportHYK.java: New. | |
1738 Importer models for HYKs. | |
1739 | |
1740 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1741 | |
1742 * doc/schema/postgresql.sql: Each entry in a HYK can have | |
1743 an optional 'Peilungsjahr' (measure) not only the whole HYK. | |
1744 To update existing databases: | |
1745 BEGIN; | |
1746 ALTER TABLE hyks DROP COLUMN measure; | |
1747 ALTER TABLE hyk_entries ADD COLUMN measure TIMESTAMP; | |
1748 COMMIT; | |
1749 | |
1750 * src/main/java/de/intevation/flys/model/HYKEntry.java, | |
1751 src/main/java/de/intevation/flys/model/HYK.java: | |
1752 Adjusted Hibernate models. | |
1753 | |
1754 2011-07-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1755 | |
1756 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
1757 Added callback mechanism and recursive file search like in the PRF parser. | |
1758 All BfG-HYK files seem to parse correctly now. TODO: Build the data structures. | |
1759 | |
1760 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: | |
1761 Added x.canRead() before accepting files for parsing. | |
1762 | |
1763 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1764 | |
1765 * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: | |
1766 Initial version of the HYK parser. Not ready, yet. | |
1767 | |
1768 * src/main/java/de/intevation/flys/importer/ImportHYKFlowZoneType.java: | |
1769 Importer model for HYK flow zone types. | |
1770 | |
1771 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1772 | |
1773 * doc/schema/postgresql.sql: Argh! Added distance_{vl|hf|vr} to | |
1774 wrong table. | |
1775 To update existing databases: | |
1776 BEGIN; | |
1777 ALTER TABLE hyk_entries DROP COLUMN distance_vl; | |
1778 ALTER TABLE hyk_entries DROP COLUMN distance_hf; | |
1779 ALTER TABLE hyk_entries DROP COLUMN distance_vr; | |
1780 ALTER TABLE hyk_formations ADD COLUMN distance_vl NUMERIC NOT NULL; | |
1781 ALTER TABLE hyk_formations ADD COLUMN distance_hf NUMERIC NOT NULL; | |
1782 ALTER TABLE hyk_formations ADD COLUMN distance_vr NUMERIC NOT NULL; | |
1783 COMMIT; | |
1784 | |
1785 * src/main/java/de/intevation/flys/model/HYKFormation.java, | |
1786 src/main/java/de/intevation/flys/model/HYKEntry.java: | |
1787 Adjusted Hibernate models. | |
1788 | |
1789 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1790 | |
1791 * src/main/java/de/intevation/flys/utils/FileTools.java: Added method | |
1792 walkTree() to traverse a directory tree. To be reused in HYK parser. | |
1793 | |
1794 * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: | |
1795 Uses the FileTools.walkTree() method now to find all PRF file. | |
1796 | |
1797 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1798 | |
1799 * doc/schema/postgresql.sql: Added missing columns. | |
1800 To update existing databases: | |
1801 BEGIN; | |
1802 ALTER TABLE hyks ADD COLUMN measure TIMESTAMP; | |
1803 ALTER TABLE hyk_entries ADD COLUMN distance_vl NUMERIC NOT NULL; | |
1804 ALTER TABLE hyk_entries ADD COLUMN distance_hf NUMERIC NOT NULL; | |
1805 ALTER TABLE hyk_entries ADD COLUMN distance_vr NUMERIC NOT NULL; | |
1806 COMMIT; | |
1807 | |
1808 * src/main/java/de/intevation/flys/model/HYKEntry.java, | |
1809 src/main/java/de/intevation/flys/model/HYK.java: | |
1810 Adjusted Hibernate models. | |
1811 | |
1812 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1813 | |
1814 * src/main/java/de/intevation/flys/importer/parsers/*.java: | |
1815 New package. Moved the file parsers (*.gew, *.sta, *.at, *.glt, *.prf, *.km, *.wst) | |
1816 into this package. | |
1817 | |
1818 * src/main/java/de/intevation/flys/importer/*.java: Adjusted the imports. | |
1819 | |
1820 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1821 | |
1822 * src/main/java/de/intevation/flys/model/HYKFormation.java, | |
1823 src/main/java/de/intevation/flys/model/HYKEntry.java, | |
1824 src/main/java/de/intevation/flys/model/HYKFlowZone.java, | |
1825 src/main/java/de/intevation/flys/model/HYKFlowZoneType.java, | |
1826 src/main/java/de/intevation/flys/model/HYK.java: New. The hibernate models | |
1827 for the HYK structures. | |
1828 | |
1829 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1830 Registered new models. | |
1831 | |
1832 * src/main/java/de/intevation/flys/model/CrossSection.java: Added | |
1833 'order by' annotation for fetching the cross section lines. | |
1834 | |
1835 2011-07-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1836 | |
1837 * doc/schema/postgresql.sql: Added structures for HYKs "Hydraulische Kenngroessen" | |
1838 To update existing databases: | |
1839 | |
1840 BEGIN; | |
1841 CREATE SEQUENCE HYKS_ID_SEQ; | |
1842 CREATE TABLE hyks ( | |
1843 id int PRIMARY KEY NOT NULL, | |
1844 river_id int NOT NULL, | |
1845 description VARCHAR(256) NOT NULL | |
1846 ); | |
1847 | |
1848 CREATE SEQUENCE HYK_ENTRIES_ID_SEQ; | |
1849 CREATE TABLE hyk_entries ( | |
1850 id int PRIMARY KEY NOT NULL, | |
1851 hyk_id int NOT NULL REFERENCES hyks(id), | |
1852 km NUMERIC NOT NULL, | |
1853 UNIQUE (hyk_id, km) | |
1854 ); | |
1855 | |
1856 CREATE SEQUENCE HYK_FORMATIONS_ID_SEQ; | |
1857 CREATE TABLE hyk_formations ( | |
1858 id int PRIMARY KEY NOT NULL, | |
1859 formation_num int NOT NULL DEFAULT 0, | |
1860 hyk_entry_id int NOT NULL REFERENCES hyk_entries(id), | |
1861 top NUMERIC NOT NULL, | |
1862 bottom NUMERIC NOT NULL, | |
1863 UNIQUE (hyk_entry_id, formation_num) | |
1864 ); | |
1865 | |
1866 CREATE SEQUENCE HYK_FLOW_ZONE_TYPES_ID_SEQ; | |
1867 CREATE TABLE hyk_flow_zone_types ( | |
1868 id int PRIMARY KEY NOT NULL, | |
1869 name VARCHAR(50) NOT NULL UNIQUE, | |
1870 description VARCHAR(256) | |
1871 ); | |
1872 | |
1873 CREATE SEQUENCE HYK_FLOW_ZONES_ID_SEQ; | |
1874 CREATE TABLE hyk_flow_zones ( | |
1875 id int PRIMARY KEY NOT NULL, | |
1876 formation_id int NOT NULL REFERENCES hyk_formations(id), | |
1877 type_id int NOT NULL REFERENCES hyk_flow_zone_types(id), | |
1878 a NUMERIC NOT NULL, | |
1879 b NUMERIC NOT NULL, | |
1880 CHECK (a <= b) | |
1881 ); | |
1882 COMMIT; | |
1883 | |
1884 2011-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1885 | |
1886 * pom.xml: Bumped Hibernate up to 3.6.5. | |
1887 | |
1888 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1889 | |
1890 * src/main/java/de/intevation/flys/utils/FileTools.java: Argh! | |
1891 Forget to call the file hashing so only the file lengths were | |
1892 compared. | |
1893 | |
1894 2011-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1895 | |
1896 * src/main/java/de/intevation/flys/utils/FileTools.java: | |
1897 Added a class HashedFile to compare files by there length | |
1898 and a message digest. Digest can be set with system property | |
1899 "flys.backend.file.cmp.digest" and defaults to MD5. Useful to | |
1900 detect file duplicates. | |
1901 | |
1902 * src/main/java/de/intevation/flys/importer/PRFParser.java: Added | |
1903 method prfAccept(File) to callback to check if a found PRF file | |
1904 should be parsed. Useful to prevent parsing file duplicates. | |
1905 | |
1906 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1907 Use the HashedFile and the PRFParser.Callback to prevent | |
1908 parsing of PRF duplicates. | |
1909 | |
1910 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1911 | |
1912 * doc/schema/postgresql.sql: Misspelled sequence. | |
1913 To update existing databases: | |
1914 | |
1915 DROP SEQUENCE CROSS_SECTION_LINES_SEQ; | |
1916 CREATE SEQUENCE CROSS_SECTION_LINES_ID_SEQ; | |
1917 | |
1918 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java: | |
1919 Added some logging because importing is slow. | |
1920 | |
1921 * src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: | |
1922 Prevent NPE if a cross section line from db has no points. | |
1923 | |
1924 2011-07-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1925 | |
1926 Parse all PRFs in all subfolders of a river and store them | |
1927 as cross sections into the database. Needs testing! | |
1928 | |
1929 * src/main/java/de/intevation/flys/importer/ImportCrossSection.java, | |
1930 src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: | |
1931 New. Importer models for cross sections. | |
1932 | |
1933 * src/main/java/de/intevation/flys/importer/XY.java: | |
1934 New. Made top level class from inner PRFParser.XY. | |
1935 | |
1936 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
1937 Moved out XY class. Renamed callback. | |
1938 | |
1939 * src/main/java/de/intevation/flys/model/CrossSection.java, | |
1940 src/main/java/de/intevation/flys/model/CrossSectionLine.java, | |
1941 src/main/java/de/intevation/flys/model/CrossSectionPoint.java, | |
1942 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
1943 Added convinience constructors. | |
1944 | |
1945 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
1946 Parse and store cross sections into database. | |
1947 | |
1948 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1949 | |
1950 * doc/schema/postgresql.sql: Introduced a new table cross_section_line | |
1951 holding the km of a set of points. | |
1952 | |
1953 * src/main/java/de/intevation/flys/model/CrossSectionLine.java: | |
1954 New. Model for a single line of a "Querprofil". | |
1955 | |
1956 * src/main/java/de/intevation/flys/model/CrossSection.java: Removed | |
1957 'km' and 'points' they are part of the line now. | |
1958 | |
1959 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
1960 They reference to the containing line now. | |
1961 | |
1962 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
1963 Registered new model. | |
1964 | |
1965 To update existing databases: | |
1966 BEGIN; | |
1967 DROP SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
1968 DROP SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
1969 DROP TABLE cross_section_points; | |
1970 DROP TABLE cross_sections; | |
1971 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
1972 CREATE TABLE cross_sections ( | |
1973 id int PRIMARY KEY NOT NULL, | |
1974 river_id int NOT NULL REFERENCES rivers(id), | |
1975 time_interval_id int REFERENCES time_intervals(id), | |
1976 description VARCHAR(256) | |
1977 ); | |
1978 CREATE SEQUENCE CROSS_SECTION_LINES_SEQ; | |
1979 CREATE TABLE cross_section_lines ( | |
1980 id int PRIMARY KEY NOT NULL, | |
1981 km NUMERIC NOT NULL, | |
1982 cross_section_id int NOT NULL REFERENCES cross_sections(id), | |
1983 UNIQUE (km, cross_section_id) | |
1984 ); | |
1985 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
1986 CREATE TABLE cross_section_points ( | |
1987 id int PRIMARY KEY NOT NULL, | |
1988 cross_section_line_id int NOT NULL REFERENCES cross_section_lines(id), | |
1989 col_pos int NOT NULL, | |
1990 x NUMERIC NOT NULL, | |
1991 y NUMERIC NOT NULL, | |
1992 UNIQUE (cross_section_line_id, col_pos) | |
1993 ); | |
1994 COMMIT; | |
1995 | |
1996 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
1997 | |
1998 * doc/schema/postgresql.sql: Dropped constraint that enforces the | |
1999 uniqueness of km and river. This is violated because there are | |
2000 more than one sounding in different year at the same km of a river. | |
2001 Added column 'description' to the cross section table to make it | |
2002 human readable. | |
2003 | |
2004 To update existing databases: | |
2005 | |
2006 ALTER TABLE cross_sections DROP CONSTRAINT cross_sections_km_key; | |
2007 ALTER TABLE cross_sections ADD COLUMN description VARCHAR(256); | |
2008 | |
2009 * src/main/java/de/intevation/flys/model/CrossSection.java: | |
2010 Added the description column to the Hibernate model. | |
2011 | |
2012 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2013 | |
2014 * doc/schema/postgresql.sql: Dropped constraint that enforces the | |
2015 uniqueness of x in a "Querprofil-Spur". There are vertical lines | |
2016 in the soundings so this constraint is violated. | |
2017 | |
2018 To update existing databases: | |
2019 | |
2020 ALTER TABLE cross_section_points DROP CONSTRAINT cross_section_points_cross_section_id_key2; | |
2021 | |
2022 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2023 | |
2024 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
2025 Added a callback to be called from parsePRFs() if | |
2026 a PRF was parsed successfully. Useful to scan whole | |
2027 sub directories for PRF files. | |
2028 | |
2029 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2030 | |
2031 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
2032 Extract the year of sounding from file names. If not found | |
2033 from the name of th containing directory. Description is made | |
2034 of file name and parent directory file name. | |
2035 | |
2036 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2037 | |
2038 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
2039 Extracted the data. All BfG PRFs are parsed correctly, now. | |
2040 | |
2041 2011-07-07 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2042 | |
2043 * src/main/java/de/intevation/flys/importer/PRFParser.java: | |
2044 Extract km from lines. TODO: extract data. | |
2045 | |
2046 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2047 | |
2048 * src/main/java/de/intevation/flys/importer/PRFParser.java: New. | |
2049 Parser for PRF files. TODO extra data and station from data lines. | |
2050 | |
2051 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2052 | |
2053 * src/main/java/de/intevation/flys/model/Point3d.java: Deleted. | |
2054 Not needed (braindead). | |
2055 | |
2056 * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
2057 Directly store the x/y values now. | |
2058 | |
2059 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
2060 Removed registration of Point3d. | |
2061 | |
2062 To update existing databases: | |
2063 | |
2064 BEGIN; | |
2065 ALTER TABLE cross_section_points DROP COLUMN point3d_id; | |
2066 DROP SEQUENCE POINTS3D_ID_SEQ; | |
2067 DROP TABLE points3d; | |
2068 ALTER TABLE cross_section_points ADD COLUMN x NUMERIC NOT NULL; | |
2069 ALTER TABLE cross_section_points ADD COLUMN y NUMERIC NOT NULL; | |
2070 ALTER TABLE cross_section_points ADD CONSTRAINT | |
2071 cross_section_points_cross_section_id_key2 UNIQUE (cross_section_id, x); | |
2072 COMMIT; | |
2073 | |
2074 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2075 | |
2076 * src/main/java/de/intevation/flys/model/CrossSection.java, | |
2077 src/main/java/de/intevation/flys/model/CrossSectionPoint.java: | |
2078 New. Hibernate models for cross-sections and their forming points. | |
2079 | |
2080 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
2081 Registered the new models. | |
2082 | |
2083 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2084 | |
2085 * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model | |
2086 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
2087 Registered point3d model. | |
2088 | |
2089 2011-07-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2090 | |
2091 * doc/schema/postgresql.sql: Add relations for cross sections. | |
2092 To update existing databases: | |
2093 BEGIN; | |
2094 | |
2095 CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; | |
2096 CREATE TABLE cross_sections ( | |
2097 id int PRIMARY KEY NOT NULL, | |
2098 km NUMERIC NOT NULL, | |
2099 river_id int NOT NULL REFERENCES rivers(id), | |
2100 time_interval_id int REFERENCES time_intervals(id), | |
2101 UNIQUE (km, river_id) | |
2102 ); | |
2103 | |
2104 CREATE SEQUENCE POINTS3D_ID_SEQ; | |
2105 CREATE TABLE points3d ( | |
2106 id int PRIMARY KEY NOT NULL, | |
2107 x NUMERIC NOT NULL, | |
2108 y NUMERIC NOT NULL, | |
2109 z NUMERIC NOT NULL | |
2110 ); | |
2111 | |
2112 CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; | |
2113 CREATE TABLE cross_section_points ( | |
2114 id int PRIMARY KEY NOT NULL, | |
2115 cross_section_id int NOT NULL REFERENCES cross_sections(id), | |
2116 point3d_id int NOT NULL REFERENCES points3d(id), | |
2117 col_pos int NOT NULL, | |
2118 UNIQUE (cross_section_id, point3d_id, col_pos), | |
2119 UNIQUE (cross_section_id, col_pos) | |
2120 ); | |
2121 | |
2122 COMMIT; | |
2123 | |
2124 2011-06-28 Ingo Weinzierl <ingo@intevation.de> | |
2125 | |
2126 Tagged RELEASE 2.4 | |
2127 | |
2128 2011-06-27 Ingo Weinzierl <ingo@intevation.de> | |
2129 | |
2130 * Changes: Prepared changes for the upcoming release. | |
2131 | |
2132 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2133 | |
2134 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
2135 src/main/java/de/intevation/flys/importer/AnnotationClassifier.java, | |
2136 src/main/java/de/intevation/flys/importer/AtFileParser.java, | |
2137 src/main/java/de/intevation/flys/importer/ValueKey.java, | |
2138 src/main/java/de/intevation/flys/importer/WstParser.java: | |
2139 Removed trailing whitespace. | |
2140 | |
2141 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2142 | |
2143 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
2144 Removed superfluous imports. | |
2145 | |
2146 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2147 | |
2148 * src/main/java/de/intevation/flys/model/River.java: | |
2149 Added a method maxOverlap to determine the gauge which has | |
2150 the max common length to a given interval. This is for | |
2151 numerical stability in slightly overlapping gauge ranges. | |
2152 | |
2153 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2154 | |
2155 * src/main/java/de/intevation/flys/model/River.java: When | |
2156 looking up a gauge by km containment use precision of 1e-6. | |
2157 | |
2158 2011-06-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2159 | |
2160 * src/main/java/de/intevation/flys/model/River.java: | |
2161 Added method to find gauge by its name. | |
2162 | |
2163 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2164 | |
2165 * doc/annotation-types.xml: Fixed some rules. | |
2166 | |
2167 * src/main/java/de/intevation/flys/importer/Importer.java, | |
2168 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
2169 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2170 Call the right constructors now. | |
2171 | |
2172 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: | |
2173 Added getter/setter for name property. | |
2174 | |
2175 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
2176 Print duplicated at WARN level not as DEBUG. | |
2177 | |
2178 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
2179 Fixed XPath expression to build the internal lookup structures | |
2180 correctly. | |
2181 | |
2182 2011-06-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2183 | |
2184 Added classification of annotation types. Needs testing! | |
2185 | |
2186 * doc/annotation-types.xml: New. Rules to classify the different | |
2187 types of annotations. The classification works like this: | |
2188 | |
2189 There are unique types like 'Bruecke', 'Pegel' and so on. | |
2190 They are defined in the /annotation/type section and | |
2191 identified by their name. One of the types can be set | |
2192 as the default type if no rule applies. | |
2193 | |
2194 In the /annotation/pattern section are two types of pattern. | |
2195 | |
2196 1 - file pattern: If a KM file is opened its filename is | |
2197 matched against the regular expressions of these | |
2198 patterns. If a match is found the corresponding type | |
2199 is used as the default type in the open file. | |
2200 If no match is found the global default type is used | |
2201 as the default type. | |
2202 | |
2203 2 - line patterns: For each line of an open KM file these | |
2204 patterns are applied to find a match. If a match is | |
2205 found the corresponding type is used as the type of | |
2206 the annotation. If no match is found the default | |
2207 file default is assumed to be the right type. For | |
2208 the file default see 1. | |
2209 | |
2210 * src/main/java/de/intevation/flys/importer/Importer.java: | |
2211 To activate the annotation type classification set | |
2212 the system property | |
2213 | |
2214 'flys.backend.importer.annotation.types' | |
2215 | |
2216 to the path of a XML looking like the annotation-types.xml | |
2217 file. If the system property is not set no classification | |
2218 is done. | |
2219 | |
2220 * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: | |
2221 New. Implements the classification. | |
2222 | |
2223 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
2224 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
2225 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2226 Looped through the annotation type classification. | |
2227 | |
2228 2011-06-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2229 | |
2230 * src/main/java/de/intevation/flys/model/River.java: | |
2231 Added method to find gauge by a position lying in its range. | |
2232 | |
2233 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2234 | |
2235 First part of flys/issue18 | |
2236 | |
2237 * doc/schema/postgresql.sql: Add new table 'annotation_types'. | |
2238 To update existing databases: | |
2239 BEGIN; | |
2240 CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ; | |
2241 CREATE TABLE annotation_types ( | |
2242 id int PRIMARY KEY NOT NULL, | |
2243 name VARCHAR(256) NOT NULL UNIQUE | |
2244 ); | |
2245 ALTER TABLE annotations ADD COLUMN type_id int REFERENCES annotation_types(id); | |
2246 COMMIT; | |
2247 | |
2248 * doc/schema/postgresql-cleanup.sql: Removed. Hopeless out-dated. | |
2249 | |
2250 * src/main/java/de/intevation/flys/model/AnnotationType.java: | |
2251 New. Hibernate model to access the type. | |
2252 | |
2253 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
2254 Register the new backend type. | |
2255 | |
2256 * src/main/java/de/intevation/flys/model/Annotation.java: | |
2257 References the annotation type. | |
2258 | |
2259 * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: | |
2260 New. Model to help import the annotation type. | |
2261 | |
2262 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
2263 Uses the import type. | |
2264 | |
2265 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
2266 Set the annotation type to 'null'. TODO: Do the classification! | |
2267 | |
2268 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2269 | |
2270 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2271 Fix for flys/issue110. start index was shifted by one. | |
2272 | |
2273 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2274 | |
2275 * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
2276 Forgot to store reference to edge. | |
2277 | |
2278 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2279 | |
2280 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
2281 Register backend model. | |
2282 | |
2283 * src/main/java/de/intevation/flys/importer/ImportEdge.java: New. Model | |
2284 for importing the edges. | |
2285 | |
2286 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
2287 Parses the edges of an annotation, too. | |
2288 | |
2289 2011-06-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2290 | |
2291 * doc/schema/postgresql.sql: Added table edges to model 'Kanten' of an annotation. | |
2292 To update existing databases: | |
2293 BEGIN; | |
2294 CREATE SEQUENCE EDGES_ID_SEQ; | |
2295 CREATE TABLE edges ( | |
2296 id int PRIMARY KEY NOT NULL, | |
2297 top NUMERIC, | |
2298 bottom NUMERIC); | |
2299 ALTER TABLE annotations ADD COLUMN edge_id int REFERENCES edges(id); | |
2300 COMMIT; | |
2301 | |
2302 * src/main/java/de/intevation/flys/model/Edge.java: New. A 'Kanten'-Model. | |
2303 * src/main/java/de/intevation/flys/model/Annotation.java: References the | |
2304 edges. | |
2305 | |
2306 2011-06-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2307 | |
2308 * src/main/java/de/intevation/flys/model/River.java: | |
2309 Added method to find gauge only by station position. | |
2310 | |
2311 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2312 | |
2313 * src/main/java/de/intevation/flys/model/River.java: | |
2314 Make search for gauges independent of from/to order. | |
2315 | |
2316 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2317 | |
2318 * doc/schema/postgresql.sql: Added a new view to select qs of a WST. | |
2319 To update existing databases: | |
2320 | |
2321 CREATE VIEW wst_q_values AS | |
2322 SELECT wc.position AS column_pos, | |
2323 wqr.q AS q, | |
2324 r.a AS a, | |
2325 r.b AS b, | |
2326 wc.wst_id AS wst_id | |
2327 FROM wst_column_q_ranges wcqr | |
2328 JOIN wst_q_ranges wqr ON wcqr.wst_q_range_id = wqr.id | |
2329 JOIN ranges r ON wqr.range_id = r.id | |
2330 JOIN wst_columns wc ON wcqr.wst_column_id = wc.id | |
2331 ORDER BY wc.position, wcqr.wst_column_id, r.a; | |
2332 | |
2333 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2334 | |
2335 * doc/schema/postgresql.sql: Added a new view to select ws of a WST. | |
2336 To update existing databases: | |
2337 | |
2338 CREATE VIEW wst_w_values AS | |
2339 SELECT wcv."position" AS km, | |
2340 wcv.w AS w, | |
2341 wc."position" AS column_pos, | |
2342 w.id AS wst_id | |
2343 FROM wst_column_values wcv | |
2344 JOIN wst_columns wc ON wcv.wst_column_id = wc.id | |
2345 JOIN wsts w ON wc.wst_id = w.id | |
2346 ORDER BY wcv."position", wc."position"; | |
2347 | |
2348 2011-05-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2349 | |
2350 flys/issue76 | |
2351 | |
2352 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2353 Close gaps between q ranges. | |
2354 | |
2355 2011-05-20 Ingo Weinzierl <ingo@intevation.de> | |
2356 | |
2357 Tagged RELEASE 2.3.1 | |
2358 | |
2359 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
2360 | |
2361 Tagged RELEASE 2.3 | |
2362 | |
2363 2011-05-13 Ingo Weinzierl <ingo@intevation.de> | |
2364 | |
2365 * Changes: Changes for release 2.3 - see Changes file to get to know about | |
2366 the version numbers of this software. | |
2367 | |
2368 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2369 | |
2370 * doc/schema/postgresql.sql: Added a column which tells | |
2371 if a river counts its km up or downwards. | |
2372 To update existing databases: | |
2373 | |
2374 ALTER TABLE rivers ADD COLUMN km_up BOOLEAN NOT NULL DEFAULT true; | |
2375 | |
2376 * src/main/java/de/intevation/flys/model/River.java: | |
2377 Adjust Hibernate mapping of new column. | |
2378 | |
2379 2011-05-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2380 | |
2381 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2382 Fixed flys/issue11 and flys51. | |
2383 | |
2384 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2385 | |
2386 * src/main/java/de/intevation/flys/importer/ValueKey.java: | |
2387 Add some unsharp comparison (eps = 1e-6) to avoid | |
2388 numerical problems. | |
2389 | |
2390 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
2391 Removed. Not need any longer. | |
2392 | |
2393 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2394 Use unsharp lookup. | |
2395 | |
2396 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2397 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2398 Flush more often. Hopefully this reduces hibernate sync | |
2399 problems?! | |
2400 | |
2401 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2402 | |
2403 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2404 Fixed silly bug. Set flush mode back to auto because | |
2405 manual flushing causes some undetermined problems. | |
2406 | |
2407 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2408 | |
2409 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2410 Do not load _all_ values from discharge tables and | |
2411 wst columns. This is extremly slow and will lead | |
2412 to OOM if more rivers are imported. Now only the | |
2413 last 20 columns und discharge tables are cached. | |
2414 | |
2415 * src/main/java/de/intevation/flys/importer/ValueKey.java: | |
2416 New. Key for caching discharge table values and wst | |
2417 column values. | |
2418 | |
2419 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
2420 Fixed bug in equals(). | |
2421 | |
2422 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
2423 Removed too eloquent debug output. | |
2424 | |
2425 2011-05-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2426 | |
2427 * src/main/java/de/intevation/flys/importer/IdValueKey.java: | |
2428 Use BigDecimals as representation for the numeric components | |
2429 which prevents running into unique constraint problems | |
2430 caused by imprecision. | |
2431 | |
2432 * src/main/java/de/intevation/flys/importer/ImportRange.java, | |
2433 src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2434 Ranges are now cached globally, too. | |
2435 | |
2436 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
2437 Improved logging. | |
2438 | |
2439 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: | |
2440 Removed superfluous imports. | |
2441 | |
2442 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2443 | |
2444 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
2445 Only accept main value types 'Q', 'W', 'D' and 'T' by default. | |
2446 '-' is not handled any more because it causes too much constraint | |
2447 problems. You can overwrite the imported type with the | |
2448 system property flys.backend.main.value.types" (default "QWTD") | |
2449 | |
2450 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2451 Set session flush mode to manual. Hopefully this improves the | |
2452 performance a bit. | |
2453 | |
2454 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2455 src/main/java/de/intevation/flys/importer/ImportGauge.java, | |
2456 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
2457 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
2458 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2459 Improved logging. | |
2460 | |
2461 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2462 | |
2463 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: Deleted | |
2464 * src/main/java/de/intevation/flys/importer/IdValueKey.java: Reinserted | |
2465 here in a more generalized form. | |
2466 | |
2467 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2468 Cache the discharge table value, too. | |
2469 | |
2470 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: | |
2471 Use the global cache. | |
2472 | |
2473 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2474 | |
2475 * src/main/java/de/intevation/flys/importer/ImporterSession.java: | |
2476 New. Centralized caching in the thread local context. Importing | |
2477 the Elbe leads to OOM because the column values of the | |
2478 WST files where loaded separately for every file. | |
2479 | |
2480 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
2481 src/main/java/de/intevation/flys/importer/Importer.java, | |
2482 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
2483 src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
2484 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2485 src/main/java/de/intevation/flys/importer/ImportMainValue.java, | |
2486 src/main/java/de/intevation/flys/importer/ImportMainValueType.java, | |
2487 src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, | |
2488 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
2489 src/main/java/de/intevation/flys/importer/ImportGauge.java, | |
2490 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, | |
2491 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
2492 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
2493 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
2494 src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, | |
2495 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java, | |
2496 src/main/java/de/intevation/flys/importer/ImportAttribute.java, | |
2497 src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
2498 Adjusted to use the new global context. | |
2499 | |
2500 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2501 | |
2502 * doc/schema/postgresql.sql: Dropped constraint which | |
2503 forces discharge tables to have a unique time interval | |
2504 for a given gauge and kind. | |
2505 | |
2506 There are AT files (historical Mosel/Perl/Perl/1967-1981.at | |
2507 and Mosel/Perl/1967-1981-1.at) which violate this | |
2508 constraint. Its a technical question to the customer | |
2509 how to handle these cases. | |
2510 | |
2511 To adjust existing databases: | |
2512 | |
2513 ALTER TABLE discharge_tables DROP CONSTRAINT discharge_tables_gauge_id_key; | |
2514 | |
2515 2011-05-08 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2516 | |
2517 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2518 There are wst files where column names are not unique. | |
2519 Make them unique by appending (1), (2) and so on. | |
2520 | |
2521 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2522 | |
2523 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2524 Import the "HW-Schutzanlagen", too. | |
2525 | |
2526 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2527 | |
2528 Make import of historical discharge tables work. | |
2529 | |
2530 * doc/schema/postgresql.sql: Added forgotten column 'description'. | |
2531 | |
2532 !!! You have to drop your database !!! | |
2533 | |
2534 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2535 src/main/java/de/intevation/flys/model/DischargeTable.java: | |
2536 Add the forgotten description property. | |
2537 | |
2538 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2539 Fixed problems with date recognition. | |
2540 | |
2541 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2542 Prefix the description of the historical discharge tables | |
2543 with "Histor.Abflusstafeln". | |
2544 | |
2545 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
2546 Fixed silly programming error. | |
2547 | |
2548 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2549 | |
2550 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2551 Inject 'kind' attribute. | |
2552 | |
2553 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2554 Traverse the "Histor.Abflusstafeln" for the historical | |
2555 discharge tables. too. TODO: Store them in the database. | |
2556 | |
2557 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2558 Added convinience constructor to set the kind of the | |
2559 discharge table. | |
2560 | |
2561 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2562 | |
2563 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2564 Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" | |
2565 in description. | |
2566 | |
2567 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2568 | |
2569 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2570 Import 'Hochwasser-Marken', too. | |
2571 | |
2572 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2573 Removed superfluous import. | |
2574 | |
2575 2011-05-05 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2576 | |
2577 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2578 Ignore lines that contain km positions which were found | |
2579 before in the same file. | |
2580 | |
2581 2011-05-05 Ingo Weinzierl <ingo@intevation.de> | |
2582 | |
2583 * src/main/java/de/intevation/flys/model/River.java: Added a method that | |
2584 returns all gauges of the river intersected by a given start and end | |
2585 point. | |
2586 | |
2587 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2588 | |
2589 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
2590 Forgot to fetch peer from result set. | |
2591 | |
2592 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2593 | |
2594 * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: | |
2595 New. Importer model help fetching the database peer. | |
2596 | |
2597 * src/main/java/de/intevation/flys/model/TimeInterval.java: | |
2598 Add convinience constructor with start and stop time. | |
2599 | |
2600 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2601 Attach a time interval to a discharge table if we find one. | |
2602 | |
2603 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2604 Store the reference to the importer model of the | |
2605 time interval of the discharge table. | |
2606 | |
2607 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2608 | |
2609 * src/main/java/de/intevation/flys/importer/AtFileParser.java: | |
2610 Try to extract time ranges from at files. | |
2611 | |
2612 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2613 | |
2614 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2615 Parse and store "amtliche Linien" wst files. | |
2616 | |
2617 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2618 | |
2619 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2620 Parse and store fixation wst files as well. | |
2621 | |
2622 2011-05-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2623 | |
2624 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2625 Parse the "zusaetzliche Laengsschnitte", too. | |
2626 | |
2627 * src/main/java/de/intevation/flys/importer/ImportWst.java: | |
2628 Add getter/setter for column 'kind'. | |
2629 | |
2630 2011-05-02 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2631 | |
2632 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2633 Fixed flys/issue19: Do not take km column in wst file as a water level. | |
2634 | |
2635 2011-05-02 Ingo Weinzierl <ingo@intevation.de> | |
2636 | |
2637 * src/main/java/de/intevation/flys/model/Gauge.java: Introduced a 'scale' | |
2638 that is used to adjust the range of min/max W values. | |
2639 | |
2640 2011-05-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2641 | |
2642 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2643 Removed superfluous import. | |
2644 | |
2645 2011-04-20 Ingo Weinzierl <ingo@intevation.de> | |
2646 | |
2647 * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: | |
2648 New. This class is used as distinct key of a WstColumnValue - e.g. as | |
2649 key in a map. | |
2650 | |
2651 * src/main/java/de/intevation/flys/importer/ImportWst.java: A | |
2652 WstColumnValue cache is build up while initialization. This cache | |
2653 contains all WstColumnValues that exist in the database. | |
2654 | |
2655 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: New | |
2656 constructor that takes the WstColumnValues cache. It is used to | |
2657 initialize new ImportWstColumnValue objects. | |
2658 | |
2659 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: | |
2660 Speedup: A ImportWstColumnValue has a WstColumnValues cache that | |
2661 contains all WstColumnValues existing in the database. This makes it | |
2662 unnecessary to call an sql statement for each WstColumnValue to | |
2663 determine its existence in the database. | |
2664 | |
2665 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2666 | |
2667 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
2668 Added a view 'wst_value_table' which aggregates the data | |
2669 to build w/q value tables. | |
2670 | |
2671 To update existing databases: | |
2672 | |
2673 BEGIN; | |
2674 CREATE VIEW wst_value_table AS | |
2675 SELECT wcv.position AS position, | |
2676 w, | |
2677 (SELECT q | |
2678 FROM wst_column_q_ranges wcqr | |
2679 JOIN wst_q_ranges wqr | |
2680 ON wcqr.wst_q_range_id = wqr.id | |
2681 JOIN ranges r | |
2682 ON r.id = wqr.range_id | |
2683 WHERE wcqr.wst_column_id = wc.id | |
2684 AND wcv.position BETWEEN r.a AND r.b) AS q, | |
2685 wc.position AS column_pos, | |
2686 w.id AS wst_id | |
2687 FROM wst_column_values wcv | |
2688 JOIN wst_columns wc | |
2689 ON wcv.wst_column_id = wc.id | |
2690 JOIN wsts w | |
2691 ON wc.wst_id = w.id | |
2692 ORDER BY wcv.position ASC, | |
2693 wc.position DESC; | |
2694 COMMIT; | |
2695 | |
2696 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2697 | |
2698 * src/main/java/de/intevation/flys/model/Wst.java: | |
2699 Add forgotten one to many relation Wst -> WstColumn. | |
2700 | |
2701 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2702 | |
2703 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2704 src/main/java/de/intevation/flys/importer/WstParser.java: | |
2705 Import of q ranges of wst files was totally broken. :-/ | |
2706 You have to reimport all your data. | |
2707 | |
2708 2011-04-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2709 | |
2710 * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2711 Forgot kind parameter in peer fetching query. | |
2712 | |
2713 2011-04-18 Ingo Weinzierl <ingo@intevation.de> | |
2714 | |
2715 * src/main/java/de/intevation/flys/model/River.java:: | |
2716 Added a new method to determine the gauge based on a given start and end | |
2717 point of the river. | |
2718 | |
2719 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2720 | |
2721 * doc/schema/postgresql.sql: Added 'position' column to wst_columns | |
2722 to allow order them by there column position in the original | |
2723 wst file. | |
2724 | |
2725 Update existing database with: | |
2726 | |
2727 BEGIN; | |
2728 ALTER TABLE wst_columns ADD COLUMN position int; | |
2729 UPDATE wst_columns w SET | |
2730 position = id - (SELECT min(id) FROM wst_columns WHERE wst_id = w.wst_id); | |
2731 ALTER TABLE wst_columns ADD CONSTRAINT wst_columns_wst_id_position_key | |
2732 UNIQUE (wst_id, position); | |
2733 COMMIT; | |
2734 | |
2735 * src/main/java/de/intevation/flys/model/Wst.java, | |
2736 src/main/java/de/intevation/flys/model/WstColumn.java: | |
2737 Adjusted models. | |
2738 | |
2739 * src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2740 src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
2741 Adjusted importer. | |
2742 | |
2743 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2744 | |
2745 * doc/schema/postgresql.sql: Forget ',' in schema. | |
2746 | |
2747 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2748 | |
2749 * src/main/java/de/intevation/flys/model/Wst.java (determineMinMaxQ): | |
2750 Fixed index problem when an empty list is returned. | |
2751 | |
2752 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
2753 | |
2754 * src/main/java/de/intevation/flys/model/Wst.java: A Wst is now able to | |
2755 return its min and max Q values. | |
2756 | |
2757 * src/main/java/de/intevation/flys/model/Gauge.java: A Gauge is now able | |
2758 to return its min and max W values. | |
2759 | |
2760 2011-04-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2761 | |
2762 * doc/schema/postgresql.sql: Added new column 'kind' in | |
2763 discharge tables and wst to distinguish between different | |
2764 kinds like 'Haupt-WST', 'zusaetzliche Laengsschnitte', | |
2765 'amtliche Daten' and so on. | |
2766 | |
2767 Update existing databases with: | |
2768 BEGIN; | |
2769 ALTER TABLE discharge_tables ADD COLUMN kind int NOT NULL DEFAULT 0; | |
2770 ALTER TABLE wsts ADD COLUMN kind int NOT NULL DEFAULT 0; | |
2771 COMMIT; | |
2772 | |
2773 * src/main/java/de/intevation/flys/model/DischargeTable.java | |
2774 src/main/java/de/intevation/flys/model/Wst.java, | |
2775 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2776 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: | |
2777 Adjusted the models. | |
2778 | |
2779 2011-04-15 Ingo Weinzierl <ingo@intevation.de> | |
2780 | |
2781 * src/main/java/de/intevation/flys/backend/SessionHolder.java: Moved to | |
2782 this module from flys-artifacts. This is necessary to get access to the | |
2783 current session in this module as well. | |
2784 | |
2785 2011-04-14 Ingo Weinzierl <ingo@intevation.de> | |
2786 | |
2787 * src/main/java/de/intevation/flys/model/River.java: Added a method that | |
2788 returns the min and max distance of a river. | |
2789 | |
2790 2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2791 | |
2792 * src/**/*.java: Removed trailing whitespace. | |
2793 | |
2794 2011-03-30 Ingo Weinzierl <ingo@intevation.de> | |
2795 | |
2796 Tagged RELEASE 0.1 | |
2797 | |
2798 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2799 | |
2800 * src/main/java/de/intevation/flys/model/Range.java: | |
2801 Forgot to save the last change before commit. | |
2802 | |
2803 2011-03-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2804 | |
2805 * src/main/java/de/intevation/flys/model/Range.java: | |
2806 Added methods to find out if two ranges intersects. | |
2807 | |
2808 2011-03-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2809 | |
2810 * src/main/java/de/intevation/flys/model/Gauge.java: | |
2811 Added an one to many relation to the discharge tables of a gauge. | |
2812 | |
2813 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2814 | |
2815 Finished import of WSTs. | |
2816 | |
2817 TODO 1: Speed it up! It takes on a high end machine over 7(!) | |
2818 minutes only for the data of the Saar. | |
2819 TODO 2: Double precision floating point representations produced | |
2820 by the the parsers leed to unique constraint violations | |
2821 in the backend on a second run. So the import is currently | |
2822 only working on freshly initialized data bases. | |
2823 More consequent working with BigDecimal and some | |
2824 rounding may be of help here. | |
2825 | |
2826 * src/main/java/de/intevation/flys/model/WstColumnValue.java: | |
2827 Added convinience constructors. | |
2828 | |
2829 * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: | |
2830 Added getPeer() method. | |
2831 | |
2832 * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
2833 Add a list of the ImportWstColumnValues produced by the WST parser. | |
2834 | |
2835 * src/main/java/de/intevation/flys/importer/WstParser.java: Add | |
2836 the (km, w) values to the ImportWstColumns. | |
2837 | |
2838 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2839 | |
2840 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2841 Build models for wsts, wst columns and q ranges and | |
2842 store them in the backend. TODO: store the w values. | |
2843 | |
2844 * src/main/java/de/intevation/flys/model/WstQRange.java | |
2845 src/main/java/de/intevation/flys/model/Wst.java, | |
2846 src/main/java/de/intevation/flys/model/Range.java, | |
2847 src/main/java/de/intevation/flys/model/WstColumnQRange.java, | |
2848 src/main/java/de/intevation/flys/model/WstColumn.java: | |
2849 Added convinience constructors. | |
2850 | |
2851 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
2852 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2853 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
2854 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
2855 src/main/java/de/intevation/flys/importer/ImportWstColumn.java, | |
2856 src/main/java/de/intevation/flys/importer/ImportRange.java: | |
2857 Added getPeer() methods. | |
2858 | |
2859 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2860 | |
2861 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2862 The unit extraction in the WST parser of desktop FLYS | |
2863 is broken! Add a hack here to repair this for our | |
2864 importer. Desktop FLYS needs a fix, too! | |
2865 | |
2866 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2867 | |
2868 * src/main/java/de/intevation/flys/importer/WstParser.java: | |
2869 Ported some stuff ver from WSTSource.java of desktop flys to | |
2870 parse WST files. TODO: create instances of the import models. | |
2871 | |
2872 * src/main/java/de/intevation/flys/utils/StringUtil.java: | |
2873 Copied from desktop flys. Used for some string operations | |
2874 in WST parser. | |
2875 | |
2876 * src/main/java/de/intevation/flys/importer/Importer.java: | |
2877 Added system property 'flys.backend.importer.dry.run'. | |
2878 Set to true only the parsing is done and no writing | |
2879 to the backend. Default: false. | |
2880 | |
2881 * src/main/java/de/intevation/flys/App.java, | |
2882 src/main/java/de/intevation/flys/model/MainValueType.java: | |
2883 Removed needless imports. | |
2884 | |
2885 2011-03-22 Ingo Weinzierl <ingo@intevation.de> | |
2886 | |
2887 * src/main/java/de/intevation/flys/model/DischargeTableValue.java, | |
2888 src/main/java/de/intevation/flys/model/DischargeTable.java: Added new | |
2889 constructors. | |
2890 | |
2891 * src/main/java/de/intevation/flys/importer/AtFileParser.java: New. This | |
2892 parser is used to '*.at' files. | |
2893 | |
2894 * src/main/java/de/intevation/flys/importer/ImportGauge.java: Added code to | |
2895 import discharge tables. | |
2896 | |
2897 * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, | |
2898 src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: New. | |
2899 Helper models for import discharge tables. | |
2900 | |
2901 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2902 | |
2903 * src/main/java/de/intevation/flys/importer/WstParser.java, | |
2904 src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2905 Added stub for WST parser. | |
2906 | |
2907 2011-03-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2908 | |
2909 * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, | |
2910 src/main/java/de/intevation/flys/importer/ImportWst.java, | |
2911 src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, | |
2912 src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, | |
2913 src/main/java/de/intevation/flys/importer/ImportWstColumn.java: | |
2914 Added importer helper model stubs for WST imports. | |
2915 | |
2916 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2917 | |
2918 Second part of parsing/storing main values. Should be finished now. | |
2919 | |
2920 * src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, | |
2921 src/main/java/de/intevation/flys/importer/ImportMainValue.java: | |
2922 New. Helper models for import main values, | |
2923 | |
2924 * src/main/java/de/intevation/flys/model/MainValue.java, | |
2925 src/main/java/de/intevation/flys/model/NamedMainValue.java: | |
2926 Added convinience constructors. | |
2927 | |
2928 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2929 Write main values to backend, too. | |
2930 | |
2931 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
2932 Build importer models for main values. | |
2933 | |
2934 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: | |
2935 Data was called 'value'. Now it is 'name' to fit the | |
2936 schema. | |
2937 | |
2938 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2939 | |
2940 * doc/schema/postgresql.sql: Fixed wrong unique constraint. | |
2941 | |
2942 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2943 Added some logging when storing gauges. | |
2944 | |
2945 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2946 | |
2947 * src/main/java/de/intevation/flys/model/Gauge.java: | |
2948 Add forgotten column river_id. | |
2949 | |
2950 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2951 Small HQL fix. | |
2952 | |
2953 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2954 | |
2955 * src/main/java/de/intevation/flys/model/Gauge.java: | |
2956 Added convinience contructor. | |
2957 | |
2958 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2959 Fixed getPeer() method. | |
2960 | |
2961 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
2962 Fixed parsing of STA files. | |
2963 | |
2964 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2965 | |
2966 * src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
2967 src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
2968 Propagate river into storing of gauges. | |
2969 | |
2970 2011-03-21 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2971 | |
2972 * src/main/java/de/intevation/flys/importer/Importer.java: | |
2973 Added code to store rivers not only annotations. | |
2974 | |
2975 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
2976 Added stub code to write gauges. | |
2977 | |
2978 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
2979 | |
2980 First part of parsing main values. | |
2981 | |
2982 * src/main/java/de/intevation/flys/App.java: Commented out | |
2983 creation of dummy rivers. | |
2984 | |
2985 * src/main/java/de/intevation/flys/model/NamedMainValues.java: | |
2986 Moved to NamedMainValue. | |
2987 | |
2988 * src/main/java/de/intevation/flys/model/NamedMainValue.java: | |
2989 New. Formerly NamedMainValues. | |
2990 | |
2991 * src/main/java/de/intevation/flys/model/MainValue.java: | |
2992 New. Forgotten part of the model. | |
2993 | |
2994 * src/main/java/de/intevation/flys/model/MainValueType.java: | |
2995 Data is String not BigDecimal | |
2996 | |
2997 * src/main/java/de/intevation/flys/model/Range.java: Removed | |
2998 contructor with double arguments. Using BigDecimal now. | |
2999 | |
3000 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
3001 Propagate BigDecimal usage. | |
3002 | |
3003 * src/main/java/de/intevation/flys/importer/Importer.java: | |
3004 Removed needless import. Added TODO | |
3005 | |
3006 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
3007 Parse the dependencies of the gauges, too. | |
3008 | |
3009 * src/main/java/de/intevation/flys/importer/StaFileParser.java: | |
3010 New. Parser for STA files. | |
3011 | |
3012 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
3013 Call STA file parser. | |
3014 | |
3015 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, | |
3016 src/main/java/de/intevation/flys/importer/ImportRange.java: | |
3017 Uses BigDecimal now. | |
3018 | |
3019 * src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
3020 Fixed wrong type cast in equals. | |
3021 | |
3022 * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: | |
3023 New. Helper model for importing main value types. | |
3024 | |
3025 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
3026 Register forgotten MainValue model. | |
3027 | |
3028 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3029 | |
3030 Store annotations in backend. | |
3031 | |
3032 * src/main/java/de/intevation/flys/model/Annotation.java: | |
3033 New convinience constructor. | |
3034 | |
3035 * src/main/java/de/intevation/flys/model/River.java: | |
3036 Added toString() method. | |
3037 | |
3038 * src/main/java/de/intevation/flys/model/Range.java: | |
3039 Fixed nasty mistake in @OneToOne annotatation. | |
3040 New convinience constructors. | |
3041 | |
3042 * src/main/java/de/intevation/flys/importer/ImportPosition.java | |
3043 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
3044 src/main/java/de/intevation/flys/importer/ImportRange.java | |
3045 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
3046 Make storing to backend work. It's a bit too slow. :-/ | |
3047 | |
3048 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
3049 Fetch peer from backend. Added method to store annotations. | |
3050 * src/main/java/de/intevation/flys/importer/Importer.java: | |
3051 Stored annotations into backend. More eloquent SQL exception | |
3052 handling. | |
3053 | |
3054 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3055 | |
3056 * src/main/java/de/intevation/flys/model/Attribute.java, | |
3057 src/main/java/de/intevation/flys/model/Position.java: | |
3058 Added convinience constructors. | |
3059 | |
3060 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
3061 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
3062 Bound them to there backend peers. | |
3063 | |
3064 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3065 | |
3066 * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: | |
3067 New. Added parser to read *.KM files. | |
3068 | |
3069 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
3070 src/main/java/de/intevation/flys/importer/PegelGltParser.java, | |
3071 src/main/java/de/intevation/flys/importer/ImportRiver.java, | |
3072 src/main/java/de/intevation/flys/importer/ImportAnnotation.java, | |
3073 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
3074 src/main/java/de/intevation/flys/importer/InfoGewParser.java, | |
3075 src/main/java/de/intevation/flys/importer/ImportAttribute.java: | |
3076 Adjusted to load the annotations from *.KM files. | |
3077 | |
3078 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3079 | |
3080 * src/main/java/de/intevation/flys/importer/ImportPosition.java, | |
3081 src/main/java/de/intevation/flys/importer/ImportRange.java, | |
3082 src/main/java/de/intevation/flys/importer/ImportAttribute.java, | |
3083 src/main/java/de/intevation/flys/importer/ImportAnnotation.java: | |
3084 New helper models for import. | |
3085 | |
3086 * src/main/java/de/intevation/flys/importer/PegelGltParser.java, | |
3087 src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
3088 Use new models. | |
3089 | |
3090 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3091 | |
3092 * src/main/java/de/intevation/flys/importer/PegelGltParser.java: | |
3093 New. Parser for PEGEL.GLT files. | |
3094 | |
3095 * src/main/java/de/intevation/flys/importer/ImportGauge.java: | |
3096 New. Import model for gauges. | |
3097 | |
3098 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
3099 Removed needless imports. | |
3100 | |
3101 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
3102 Added method to parse the gauges. | |
3103 | |
3104 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
3105 Trigger pegel glt file parsing. | |
3106 | |
3107 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3108 | |
3109 * src/main/java/de/intevation/flys/importer/Importer.java: | |
3110 Used thread local pattern to make sharing of session easier. | |
3111 | |
3112 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3113 | |
3114 * src/main/java/de/intevation/flys/importer/Importer.java: | |
3115 Fixed error in HQL statement. | |
3116 | |
3117 2011-03-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3118 | |
3119 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
3120 Commented out a debug block because it leaks the db password. | |
3121 | |
3122 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3123 | |
3124 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
3125 Expose imported rivers. | |
3126 | |
3127 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
3128 Store imported rivers into database. Needs testing! | |
3129 | |
3130 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3131 | |
3132 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
3133 Default connection parameters are now overwritable with | |
3134 system properties (defaults in brackets): | |
3135 - user name: flys.backend.user (flys) | |
3136 - user password: flys.backend.password (flys) | |
3137 - db dialect: flys.backend.dialect (org.hibernate.dialect.PostgreSQLDialect) | |
3138 - db driver: flys.backend.driver (org.postgresql.Driver) | |
3139 - db url: flys.backend.url (jdbc:postgresql://localhost:5432/flys) | |
3140 | |
3141 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3142 | |
3143 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
3144 Expose createSessionFactory() as public to be usable without | |
3145 a artifact database running. | |
3146 | |
3147 2011-03-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3148 | |
3149 * src/main/java/de/intevation/flys/utils/FileTools.java: | |
3150 Tools for handling with filenames. Currently there is | |
3151 a repair(File) method with repairs letter case errors | |
3152 which is useful when reading windows filenames on a | |
3153 un*x platform. | |
3154 | |
3155 * src/main/java/de/intevation/flys/importer/Importer.java: | |
3156 Standalone app to read data from the file system and | |
3157 store it in a database. Currently it does not store | |
3158 anything. It only loads info gew files. | |
3159 | |
3160 * src/main/java/de/intevation/flys/importer/InfoGewParser.java: | |
3161 Info gew parser. | |
3162 | |
3163 * src/main/java/de/intevation/flys/importer/ImportRiver.java: | |
3164 Helper model of a river used produced by parsing the | |
3165 info gew files. | |
3166 | |
3167 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3168 | |
3169 * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: | |
3170 New. SessionFactoryProvider.getSessionFactory() provides a | |
3171 SessionFactory to use the Hibernate O/R mapper for the FLYS backend. | |
3172 | |
3173 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3174 | |
3175 * pom.xml: Added dependency to artifacts-commons to | |
3176 be able to use the global configuration of the artifact database. | |
3177 | |
3178 2011-03-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3179 | |
3180 * src/main/java/de/intevation/flys/App.java: Wire all POJOs | |
3181 to corresponding factory. | |
3182 | |
3183 * src/main/java/de/intevation/flys/model/*.java: Generate | |
3184 all foreign key constraints. TODO: name them correctly | |
3185 because the machine generated names are ugly and do | |
3186 not fit the PostgreSQL names. | |
3187 | |
3188 * doc/schema/postgresql.sql: Small quantifier fix in descriptions | |
3189 of wst columns. | |
3190 | |
3191 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3192 | |
3193 * doc/schema/postgresql.sql: Fixed wrong spelled | |
3194 column references in foreign keys introduces with | |
3195 last change. | |
3196 | |
3197 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3198 | |
3199 * src/main/java/de/intevation/flys/model/*.java: Added | |
3200 column annotations for simple fields. TODO: foreign keys. | |
3201 | |
3202 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3203 | |
3204 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
3205 Fixed inconsistent table names. | |
3206 | |
3207 * src/main/java/de/intevation/flys/model/*.java: Added | |
3208 entity and id annotations. | |
3209 | |
3210 2011-03-14 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3211 | |
3212 * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: | |
3213 Added missing sequences. | |
3214 | |
3215 * doc/schema/sqlite.sql: Deleted. Not longer supported. | |
3216 | |
3217 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3218 | |
3219 * doc/schema/postgresql-cleanup.sql: Forgot to add. | |
3220 | |
3221 * src/main/java/de/intevation/flys/App.java: Use | |
3222 Apache Commons DBCP as Hibernate connection provide. | |
3223 | |
3224 * src/main/java/de/intevation/flys/model/River.java: | |
3225 Added a constructor with string argument. Set the | |
3226 sequence increment to 1 (eat up 100 at a time before). | |
3227 | |
3228 * pom.xml: Added PostgreSQL 8.4 driver as runtime dependency. | |
3229 | |
3230 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3231 | |
3232 * doc/schema/postgresql-cleanup.sql: New. Tear down schema | |
3233 for a postgres database. | |
3234 | |
3235 * doc/schema/postgresql.sql: Added squence for | |
3236 auto generating ids in river table. Cleaned up schema. | |
3237 | |
3238 * src/main/java/de/intevation/flys/App.java: Simple | |
3239 test app to interact with hibernate. Needs to be removed | |
3240 because its only a toy. | |
3241 | |
3242 * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: | |
3243 New. Binds Apache Commons to Hibernate. | |
3244 | |
3245 * pom.xml: Added dependencies to log4j, commons dbcp, | |
3246 JPA of hibernate. | |
3247 | |
3248 * src/main/java/de/intevation/flys/model/River.java: Added | |
3249 JPA annotations. | |
3250 | |
3251 * src/main/java/de/intevation/flys/model/*.java: Replaced | |
3252 Long with Integer because column ids are only four bytes wide. | |
3253 | |
3254 2011-03-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3255 | |
3256 * doc/schema/sqlite.sql, doc/schema/postgresql.sql: Fixed | |
3257 smaller issues in ddl. | |
3258 | |
3259 * src/main/java/de/intevation/flys/model/*.java: Added POJOs | |
3260 of to be mapped. TODO: Map them! | |
3261 | |
3262 * pom.xml: Added plugin config for hibernate. | |
3263 | |
3264 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3265 | |
3266 * pom.xml: Added dependency (and corresponding repository) to | |
3267 Hibernate Core 3.6.1 Final | |
3268 | |
3269 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3270 | |
3271 * pom.xml, src/**: Created a new empty maven project: | |
3272 $ mvn archetype:create \ | |
3273 -DgroupId=de.intevation.flys \ | |
3274 -DartifactId=flys-backend | |
3275 | |
3276 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3277 | |
3278 * README: New. Some setup instructions. | |
3279 | |
3280 * doc/schema/postgresql.sql: New. Schema converted to PostgreSQL | |
3281 | |
3282 * doc/schema/sqlite.sql: Fixed defect foreign key constraints. | |
3283 | |
3284 2011-03-09 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3285 | |
3286 * doc/schema/sqlite.sql: Factorized time intervals out into | |
3287 a separated table. | |
3288 | |
3289 2011-01-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
3290 | |
3291 * contrib/import-kms.py, contrib/import-gew.py: Initial scripts | |
3292 to import data into SQLite database. They still need some work. | |
3293 | |
3294 2011-02-10 Sascha L. Teichmann <sascha.teichmann@intevation.de>: | |
3295 | |
3296 * doc/schema/sqlite.sql: Added initial schema for | |
3297 FLYS database. |