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