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