christian@4183: 2012-10-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: christian@4183: Added new flag 'flys.backend.skip.historical.discharge.tables' christian@4183: to ignore the historical discharge tables during gauge import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Ignore the historical discharge tables if flag is set. christian@4183: christian@4183: * contrib/run_hydr_morph.sh: Adjusted shell script. christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Adjusted docu. christian@4183: christian@4183: 2012-09-30 Sascha L. Teichmann christian@4183: christian@4183: * .hgignore: First hgignore christian@4183: christian@4183: 2012-09-28 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql, christian@4183: doc/schema/oracle-spatial.sql: Changed the type of date columns to christian@4183: VARCHAR. This is a quick fix to solve the concatination problem in christian@4183: Oracle and PostgreSQL. Both aren't able to concatinate null values. christian@4183: So, null values are not valid for those columns. Users can now decide christian@4183: to fill these columns with correct values or an empty string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DgmSqlConverter.java: Set christian@4183: year_from and year_to values to an empty string if no correct value is christian@4183: specified. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: For issue862/1, fix parsing of year field of bed height csvs, christian@4183: which sometimes contain non-year character. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java: christian@4183: Extend RE to parse year field of Bed Height data csv. christian@4183: christian@4183: 2012-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/RiverAxis.java: christian@4183: Added new method to query a special kind of river axes. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Backend-part for fix of issue863. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java: christian@4183: Handle missing data points. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: christian@4183: Doc. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Removed debug output. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Handle csv lines with just the km set ("gaps"). christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java: christian@4183: Added TODO, as more changes towards fix for issue863 are necessary. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Towards fix for issue863 (data gaps in bed height single values). christian@4183: christian@4183: * doc/schema/postgresql-minfo.sql, christian@4183: doc/schema/oracle-minfo.sql: christian@4183: Drop "NOT NULL" constraints on some single bed height value columns. christian@4183: christian@4183: 2012-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightSingle.java: christian@4183: Replaced labeled continue by a simple break. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DgmSqlConverter.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportElevationModel.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-27 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: christian@4183: christian@4183: * doc/schema/import-dems.sql: Added more information to fullfil the schema christian@4183: for dems. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DgmSqlConverter.java: New converter christian@4183: for CSV files with DGM information; results in a SQL file with INSERT christian@4183: statements. christian@4183: christian@4183: * pom.xml: Added dependency to OpenCSV for reading CSV files. christian@4183: christian@4183: 2012-09-24 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/importer.py: Fixed method name for ERROR log christian@4183: messages. christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Set geometry dim to '3' instead of christian@4183: '4'. christian@4183: christian@4183: 2012-09-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportElevationModel.java: christian@4183: Some minor bugfixes for MINFO import. christian@4183: christian@4183: 2012-09-24 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Adapted schema; added missing christian@4183: relations. christian@4183: christian@4183: * doc/schema/postgresql-drop-spatial.sql: SQL statements to drop an christian@4183: existing FLYS postgresql schema. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java, christian@4183: src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Remove fetchInfoURL methods. The info url will be generated in the christian@4183: client. christian@4183: christian@4183: 2012-09-22 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/oracle.sql: christian@4183: Addes column 'official_number' to rivers table. christian@4183: This should contain the 'Bundeswasserstrassen Identnummer'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added new column to Hibernate model. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java, christian@4183: src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Rename getInfoURL methods to fetchInfoURL until the values are fetched christian@4183: from the db to statisfy hibernate. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java, christian@4183: src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Add new methods to return a HTTP URL for additional information about the christian@4183: river or gauge. christian@4183: christian@4183: 2012-09-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentYield.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevel.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportMorphWidth.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSQRelation.java: Store christian@4183: values into database only if its peer has been successfully stored, christian@4183: otherwise skip values. christian@4183: christian@4183: 2012-09-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightType.java: Accept christian@4183: "Querprofil" as valid BedHeightType. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java: christian@4183: Added missing GrainFraction.TOTAL type to parser. christian@4183: christian@4183: 2012-09-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java: christian@4183: Some litte logging improvements and be more tolerant with exceptions. christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: Taggd RELEASE 2.9.1 christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightEpoch.java: christian@4183: Corrected broken loop to find epochs for river and km range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightSingle.java: christian@4183: Corrected broken loop to find singles for river and km range. christian@4183: christian@4183: 2012-09-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java: christian@4183: Made code more robust. christian@4183: christian@4183: 2012-09-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: christian@4183: Add system property 'flys.backend.importer.skip.default' christian@4183: which enables the switching of the skipping default. christian@4183: Very useful if you want only some sub systems by christian@4183: setting this to 'true' and the sub systems to 'false'. christian@4183: christian@4183: 2012-09-12 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Indices on cross sections christian@4183: were created too early (before the referenced tables christian@4183: were created). christian@4183: christian@4183: 2012-09-12 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Add new method determineMinMaxQ to fetch the mimimum and maximum q values christian@4183: from the database. christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * postgresql-minfo.sql: Added missing tables. christian@4183: * oracle-minfo.sql: Fixed small typos. christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Java 1.6 -> 1.6 christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/StringUtil.java: christian@4183: Replaced german comment (with an ill encoded Umlaut). christian@4183: christian@4183: 2012-09-10 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Remove obsolet method (#851). christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: We need min/max Q, too. christian@4183: christian@4183: 2012-09-10 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MinMaxWQ.java, christian@4183: src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Add method fetchMinMaxWQ to Gauge. This mehtod returns a new MinMaxWQ christian@4183: instance that contains the fetched values for the gauge overview info. christian@4183: christian@4183: 2012-09-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Moved some code over from flys-artifacts. christian@4183: christian@4183: 2012-09-07 Ingo Weinzierl christian@4183: christian@4183: Tagged module as '2.9'. christian@4183: christian@4183: 2012-09-07 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Rename getDurationCurveData to fetchDurationCurveData to satisfy christian@4183: hibernate. christian@4183: christian@4183: 2012-09-06 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Move static getDurationCurveData method from flys-artifacts christian@4183: MainValuesFactory class to a instance method in Gauge class. christian@4183: christian@4183: 2012-08-30 Felix Wolfsteller christian@4183: christian@4183: Attempt fix for issue821 (cross sections just till +/-500m). christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: christian@4183: Set max value for cross sections to 2500 instead of 500. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * contrib/run_geo.sh: New run script for the python based geo importer. christian@4183: christian@4183: * contrib/run_hydr_morph.sh: New run script for the java based importer christian@4183: for hydrological and morphological data. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/overview.tex: Fixed typo. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-geodaesie.tex, christian@4183: doc/documentation/de/importer-hydr-morph.tex: Corrected name of run christian@4183: scripts. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-geodaesie.tex, christian@4183: doc/documentation/de/importer-hydr-morph.tex, christian@4183: doc/documentation/de/importer-manual.tex: Bugfixes and new geo error christian@4183: description. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/importer.py: Fixed broken method call. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/overview.tex: Hint to root permissions. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/importer.py: Set 'path' attribute for each feature. christian@4183: christian@4183: * contrib/shpimporter/axis.py: Also accept shapes with 'achse' in its name. christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added 'path' attribute to each db christian@4183: relation. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-geodaesie.tex: Bugfixes and added hint. christian@4183: christian@4183: * doc/documentation/de/importer-manual.tex: Set document revision and christian@4183: date. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Added manual line breaks. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Fixed bug during PDF christian@4183: creation. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Bugfixes. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/overview.tex: Improved description of database christian@4183: schema creation. Describe command to unpack importer tarball. christian@4183: christian@4183: 2012-08-30 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-geodaesie.tex: Added further error message christian@4183: if no connection to Oracle database could be established. christian@4183: christian@4183: 2012-08-29 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-geodaesie.tex: Documented install steps christian@4183: for Oracle Instantclient and python and gdal. christian@4183: christian@4183: 2012-08-27 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Describe Log4J christian@4183: configuration; some smaller bugfixes. christian@4183: christian@4183: 2012-08-27 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/overview.tex: Added comment to directory structure christian@4183: of a river. christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Describe import of christian@4183: morphological files. christian@4183: christian@4183: 2012-08-27 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/title.tex, christian@4183: doc/documentation/de/overview.tex, christian@4183: doc/documentation/de/importer-hydr-morph.tex, christian@4183: doc/documentation/de/importer-manual.tex: Smaller fixed and structural christian@4183: changes. christian@4183: christian@4183: 2012-08-27 Ingo Weinzierl christian@4183: christian@4183: * doc/documentation/de/importer-hydr-morph.tex: Added documentation from christian@4183: README. christian@4183: christian@4183: 2012-08-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Documented which hydrological files are taken into account. christian@4183: christian@4183: 2012-08-26 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Documented the classification of the annotations. christian@4183: christian@4183: 2012-08-26 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Documented the db credentials. christian@4183: christian@4183: 2012-08-24 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Completed the error messages (Puh!) christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/AnnotationClassifier.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/WstParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSQRelation.java: christian@4183: Made error messages identifiable. christian@4183: christian@4183: 2012-08-24 Ingo Weinzierl christian@4183: christian@4183: * doc/shapeimporter, christian@4183: doc/shapeimporter/documentation.txt: Removed. The documentation is now christian@4183: written in latex. christian@4183: christian@4183: * doc/documentation, christian@4183: doc/documentation/de: New. The place where the german documentation is christian@4183: located. christian@4183: christian@4183: * doc/documentation/de/title.tex, christian@4183: doc/documentation/de/importer-geodaesie.tex, christian@4183: doc/documentation/de/figures/bfg_logo.png, christian@4183: doc/documentation/de/figures/intevation-logo.pdf, christian@4183: doc/documentation/de/overview.tex, christian@4183: doc/documentation/de/importer-hydr-morph.tex, christian@4183: doc/documentation/de/importer-manual.tex: German documentation of the christian@4183: importer and shape importer. christian@4183: christian@4183: * doc/documentation/de/Makefile: Makefile to generate the documentation. christian@4183: christian@4183: * doc/documentation/de/README: Instructions to generate the documentation. christian@4183: christian@4183: 2012-08-23 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Added warning messages. TODO: More warnings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/AtFileParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Made warnings identifiable. christian@4183: christian@4183: 2012-08-23 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Added error messages. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/PRFParser.java christian@4183: src/main/java/de/intevation/flys/importer/parsers/HYKParser.java christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Made errors identifiable. christian@4183: christian@4183: 2012-08-23 Sascha L. Teichmann christian@4183: christian@4183: * doc/README.txt: Documentation for the importer (german). christian@4183: TODO: db crendentials, warning & errors, annotation types. christian@4183: christian@4183: 2012-08-22 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/run.sh: Moved 'SKIP_XXX' variables to the top of christian@4183: the script. christian@4183: christian@4183: 2012-08-22 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/axis.py: Use log methods of shpimporter and christian@4183: removed print() calls. christian@4183: christian@4183: * contrib/shpimporter/importer.py: Evaluate command line option 'dry_run'. christian@4183: Do not commit database transaction if it is activated. christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py: Added new command line option christian@4183: 'dry_run' to supress database transactions. christian@4183: christian@4183: 2012-08-22 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py: Use OptionParse to read command line christian@4183: options. Now, it is no longer necessary to adjust user specific settings christian@4183: in python files. Users should adapt run.sh script for specific settings. christian@4183: christian@4183: * contrib/shpimporter/catchments.py, christian@4183: contrib/shpimporter/boundaries.py, christian@4183: contrib/shpimporter/hws.py, christian@4183: contrib/shpimporter/importer.py, christian@4183: contrib/shpimporter/uesg.py, christian@4183: contrib/shpimporter/axis.py, christian@4183: contrib/shpimporter/km.py, christian@4183: contrib/shpimporter/floodplains.py, christian@4183: contrib/shpimporter/lines.py, christian@4183: contrib/shpimporter/gauges.py, christian@4183: contrib/shpimporter/buildings.py, christian@4183: contrib/shpimporter/fixpoints.py, christian@4183: contrib/shpimporter/crosssectiontracks.py: Added new method getName(). christian@4183: christian@4183: * contrib/shpimporter/utils.py: Use shpimporter functions to print debug christian@4183: messages. christian@4183: christian@4183: * contrib/shpimporter/run.sh: New shell script to run the shape importer christian@4183: with a default configuration. christian@4183: christian@4183: 2012-08-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastAnnotations.java: christian@4183: Added toString() to Annotation. christian@4183: christian@4183: 2012-07-27 Ingo Weinzierl christian@4183: christian@4183: Tagged module as '2.8.1'. christian@4183: christian@4183: 2012-07-18 Felix Wolfsteller christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/oracle.sql: christian@4183: Adjusted the official_lines views to include wst column pos. christian@4183: christian@4183: 2012-07-16 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as '2.8'. christian@4183: christian@4183: 2012-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java, christian@4183: src/main/java/de/intevation/flys/backend/SpatialInfo.java: christian@4183: Removed same package imports. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/hibernate/MapResultTransformer.java: christian@4183: Added static INSTANCE because its stateless. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/hibernate/MapResultTransformer.java: christian@4183: Strategy to directly transform native SQL results into Maps. christian@4183: christian@4183: 2012-07-11 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue359 christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: christian@4183: Removed extension from PRF descriptions. christian@4183: christian@4183: 2012-07-11 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/oracle.sql: christian@4183: Added indices for fasten access to cross section points. christian@4183: christian@4183: 2012-07-11 Sascha L. Teichmann christian@4183: christian@4183: Partial fix for flys/issue697 christian@4183: christian@4183: * doc/schema/oracle.sql: Increased the decimal places of Ws, Qs and Kms to 5. christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Set correct connection provider class (its package has changed in the christian@4183: last commit). christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: christian@4183: Fixed broken package declaration. christian@4183: christian@4183: 2012-06-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/oracle.sql: christian@4183: Added views to access the 'Amtlichen Linien'. christian@4183: christian@4183: 2012-06-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/**/*.java: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: Make access to SedDB configurable over conf.xml and provide christian@4183: access to sessions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Moved FLYS specific stuff out into the concept of credential classes christian@4183: which provides the user, password, dialect, driver, url and the christian@4183: Hibernate classes to bind. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/Credentials.java: New. christian@4183: Abstact class to provide the data needed for the SessionFactoryProvider. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/FLYSCredentials.java: New. christian@4183: Extends Credentials to serve the FLYS specific stuff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SedDBCredentials.java: New. christian@4183: Extends Credentials to serve the SedDB specific stuff. The parameters christian@4183: are drawn from conf.xml in the form: christian@4183: christian@4183: christian@4183: ... christian@4183: christian@4183: USER christian@4183: PASSWORD christian@4183: DRIVER christian@4183: URL christian@4183: DIALECT christian@4183: christian@4183: ... christian@4183: christian@4183: christian@4183: If absent defaults are: christian@4183: - user: seddb christian@4183: - password: seddb christian@4183: - driver: org.postgresql.Driver christian@4183: - url: jdbc:postgresql://localhost:5432/seddb christian@4183: - dialect: org.hibernate.dialect.PostgreSQLDialect christian@4183: christian@4183: Defaults can be overwritten with system properties: christian@4183: - user: flys.seddb.user christian@4183: - password: flys.seddb.password christian@4183: - driver: flys.seddb.driver christian@4183: - url: flys.seddb.url christian@4183: - dialect: flys.seddb.dialect christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SedDBSessionHolder.java: New. christian@4183: Use this if you want to establish a session to the SedDB! christian@4183: Works like the SessionHolder. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionHolder.java: christian@4183: Add Override annotation. This holder gives you a session christian@4183: to the FLYS database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Adjusted. christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/seddb/model/*.java: Hibernate access to christian@4183: SedDB generated by Eclipse (ugly formatted, but compiles). christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java: christian@4183: Re-establish cross platform compatibilty again. christian@4183: christian@4183: 2012-06-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: Added the christian@4183: missing 'name' property and added a function that returns all christian@4183: CrossSectionTracks of a specific river with a specific name. christian@4183: christian@4183: 2012-06-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added missing river_id column to christian@4183: sq_relation table and reordered the drop statements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SQRelationValue.java, christian@4183: src/main/java/de/intevation/flys/model/SQRelation.java: Added missing christian@4183: constructors and fixed some minor bugs that occured during import test. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSQRelationValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSQRelation.java: christian@4183: Implemented code to store sq relations and values into db. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java: christian@4183: Override parse() to retrieve the filename. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented christian@4183: code to store sq relations into db. christian@4183: christian@4183: 2012-06-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSQRelationValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSQRelation.java: christian@4183: New classes used during the import process of MINFO sq relations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java: christian@4183: New line parser that reads MINFO specifc sq relation files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added system christian@4183: property to skip parsing sq relations. christian@4183: christian@4183: "-Dflys.backend.importer.skip.sq.relation" christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse MINFO christian@4183: sq relations. christian@4183: christian@4183: 2012-06-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Cleared some christian@4183: irritating debug statements. christian@4183: christian@4183: 2012-06-12 Ingo Weinzierl christian@4183: christian@4183: * doc/annotation-types.xml: Added regex to match "Geschiebemesstellen" as christian@4183: "Messstelle" type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java: christian@4183: Parse KM files in "../Morphologie/Streckendaten/". On Windows Systems, christian@4183: this won't work! christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastAnnotations.java: christian@4183: Added Override annotation to new NameFilter. christian@4183: christian@4183: 2012-06-11 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastAnnotations.java: christian@4183: Added filter for annotation names. christian@4183: christian@4183: 2012-06-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastAnnotations.java: christian@4183: Fix comment. christian@4183: christian@4183: 2012-06-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SQRelationValue.java: christian@4183: Fix hibernaty annotation symptom (make it run again). christian@4183: christian@4183: 2012-06-07 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Schema additions for MINFO s/q christian@4183: relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SQRelationValue.java, christian@4183: src/main/java/de/intevation/flys/model/SQRelation.java: New model christian@4183: classes for MINFO s/q relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/GaugeLocation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-05-27 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as '2.7'. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightSingle.java: Added lower christian@4183: and upper km to function that returns all singles and epochs for a given christian@4183: river. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java: Fixed christian@4183: a typo. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightEpochValue.java: Added christian@4183: functions to retrieve single and epoch values based on its owner and km christian@4183: range. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightSingle.java: Added christian@4183: functions to get singles and epochs by river and by id. christian@4183: christian@4183: 2012-05-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FlowVelocityModel.java, christian@4183: src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java, christian@4183: src/main/java/de/intevation/flys/model/DischargeZone.java: Added static christian@4183: functions to retrieve data from database. christian@4183: christian@4183: 2012-05-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DischargeZone.java: Added a christian@4183: function getDischargeZones() that returns all DischargeZones for a given christian@4183: river. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/gauges.py: Search for field 'MPNAAM' and use its christian@4183: value as name for the geometry. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/GaugeLocation.java: New model christian@4183: class for storing locations of gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered GaugeLocation class. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HydrBoundary.java, christian@4183: src/main/java/de/intevation/flys/model/HydrBoundaryPoly.java: New. christian@4183: Hydrological boundaries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Line.java: Modified signature of christian@4183: Line.getLines(). It now also takes the name of a line to retrieve more christian@4183: specific lines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Building.java: Modified signature christian@4183: of Building.getBuildings(). It now also takes the name of a building to christian@4183: retrieve more specific lines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered HydrBoundary and HydrBoundaryPoly classes. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/crosssectiontracks.py: Search for 'STATION' field in christian@4183: shapefile to extract the current km. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Hws.java: The getHws() function christian@4183: got a further parameter 'name' to retrieve specific hws only. christian@4183: christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Catchment.java: The christian@4183: getCatchments() function got a further parameter 'name' to retrieve christian@4183: specific catchments only. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-spatial_idx.sql: Set the geometry type of 'catchments' christian@4183: to 'multipolygon'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Catchment.java: The geometry christian@4183: attribute in such instances is now from type 'Geometry'. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/import-dems.sql: New. Insert statements to insert dems into christian@4183: database. christian@4183: christian@4183: 2012-05-04 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-drop-spatial.sql, christian@4183: doc/schema/oracle-spatial.sql: New relation 'gauge_location' and some christian@4183: bugfixes in the drop schema. christian@4183: christian@4183: * contrib/shpimporter/catchments.py, christian@4183: contrib/shpimporter/hws.py, christian@4183: contrib/shpimporter/gauges.py: New importers. christian@4183: christian@4183: * contrib/shpimporter/importer.py: Added a debug statement to improve the christian@4183: visibility of the log output. christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py: Make use of the new importers. christian@4183: christian@4183: christian@4183: 2012-05-03 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-drop-spatial.sql, christian@4183: doc/schema/oracle-spatial.sql: Added new relations for hydrological christian@4183: boundaries and appended a 'name' field to relations that had no such christian@4183: field yet. christian@4183: christian@4183: * contrib/shpimporter/floodplains.py, christian@4183: contrib/shpimporter/boundaries.py: New importers for floodplain and christian@4183: hydrological boundaries. christian@4183: christian@4183: * contrib/shpimporter/lines.py, christian@4183: contrib/shpimporter/buildings.py, christian@4183: contrib/shpimporter/uesg.py, christian@4183: contrib/shpimporter/fixpoints.py, christian@4183: contrib/shpimporter/axis.py, christian@4183: contrib/shpimporter/crosssectiontracks.py, christian@4183: contrib/shpimporter/km.py: Set the 'name' attribute for new features. christian@4183: christian@4183: * contrib/shpimporter/importer.py: Some bugfixes and improvements: christian@4183: geometries are transformed into a destination coordinate system now. christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py: Use all importers and defined the christian@4183: destination srs. christian@4183: christian@4183: 2012-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java, christian@4183: src/main/java/de/intevation/flys/model/CrossSectionPoint.java, christian@4183: src/main/java/de/intevation/flys/model/CrossSectionLine.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Store meassure points of profiles as Doubles not as BigDecimal. christian@4183: This should save a lot of memory during the import. christian@4183: christian@4183: 2012-04-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-04-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql-minfo.sql: Adjusted PostgreSQL port christian@4183: to match the Oracle schema. christian@4183: christian@4183: 2012-04-27 Ingo Weinzierl christian@4183: christian@4183: * doc/annotation-types.xml: Adapted annotation typed based on BfG wishes. christian@4183: christian@4183: 2012-04-27 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-drop.sql: New SQL file to drop WINFO specific db christian@4183: schema. christian@4183: christian@4183: 2012-04-27 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle.sql: Made SQL instructions upper case. christian@4183: christian@4183: 2012-04-27 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-drop-spatial.sql: New statements to drop the whole christian@4183: spatial schema. christian@4183: christian@4183: 2012-04-27 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/lines.py, christian@4183: contrib/shpimporter/buildings.py, christian@4183: contrib/shpimporter/importer.py, christian@4183: contrib/shpimporter/fixpoints.py, christian@4183: contrib/shpimporter/axis.py, christian@4183: contrib/shpimporter/crosssectiontracks.py, christian@4183: contrib/shpimporter/km.py: New classes for importing specific christian@4183: shapefiles. Each of this imports defines its target db tablename and a christian@4183: directory path to the shapefiles it should import. christian@4183: christian@4183: * contrib/shpimporter/uesg.py: Some modifications necessary to streamline christian@4183: the import process of shapefiles. christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py: Use all available imports for the christian@4183: import process. christian@4183: christian@4183: 2012-04-26 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Repaired broken schema. christian@4183: christian@4183: 2012-04-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a config christian@4183: option to skip parsing MINFO waterlevel differences: christian@4183: christian@4183: -Dflys.backend.importer.skip.waterlevel.differences=True christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse and christian@4183: store MINFO specific waterlevel differences. christian@4183: christian@4183: 2012-04-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java: christian@4183: New parser for MINFO specific waterlevel differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java: christian@4183: New importer classes used during the import process of MINFO specific christian@4183: waterlevel differences. christian@4183: christian@4183: 2012-04-26 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added a missing constraint to christian@4183: 'waterlevel_difference' relation. Remove that constraint in christian@4183: oracle-drop-minfo.sql. christian@4183: christian@4183: 2012-04-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java: christian@4183: (setValue, setValues): Change setter name to allow hibernate to recognize christian@4183: it. christian@4183: christian@4183: 2012-04-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java, christian@4183: src/main/java/de/intevation/flys/model/WaterlevelDifference.java, christian@4183: src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java: christian@4183: New model classes for MINFO specific waterlevel differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes. christian@4183: christian@4183: 2012-04-24 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Improved the schema to store MINFO christian@4183: specific waterlevel differences. christian@4183: christian@4183: 2012-04-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WaterlevelValue.java: Renamed a christian@4183: property ('qRange' -> 'qrange') because there have been problem during the christian@4183: import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java: christian@4183: Filled the stub with code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWaterlevelValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevel.java: Some christian@4183: adaptions and missing methods which are required during the import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Use the christian@4183: correct directory to search for waterlevel files. christian@4183: christian@4183: 2012-04-24 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Small type adaptions in the waterlevel_values christian@4183: relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java: christian@4183: First stub of a parser for MINFO specific waterlevel values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a new config christian@4183: option to skip parsing MINFO specifc waterlevel_values: christian@4183: christian@4183: -Dflys.backend.importer.skip.waterlevels=True christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Added code christian@4183: path to start parsing and storing MINFO specific waterlevel values. christian@4183: christian@4183: 2012-04-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWaterlevelValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevelQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWaterlevel.java: New christian@4183: importer classes used for MINFO specific waterlevel import. christian@4183: christian@4183: 2012-04-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WaterlevelQRange.java, christian@4183: src/main/java/de/intevation/flys/model/WaterlevelValue.java, christian@4183: src/main/java/de/intevation/flys/model/Waterlevel.java: New model christian@4183: classes for MINFO specific waterlevel data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes. christian@4183: christian@4183: 2012-04-20 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added relations for waterlevels christian@4183: specific to MINFO. Note: those waterlevel values are not stored in the christian@4183: WINFO specific relations! christian@4183: christian@4183: 2012-04-19 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentYield.java, christian@4183: src/main/java/de/intevation/flys/model/SedimentYield.java: Added a christian@4183: column 'description' to the sediment_yield relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java: christian@4183: New parser for sediment yield data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/GrainFraction.java: Added constants christian@4183: that represent the names of the grain fraction types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGrainFraction.java: New christian@4183: constructor that takes a name only. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Improved the christian@4183: process of parsing sediment yield files. christian@4183: christian@4183: 2012-04-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added new config christian@4183: option to skip parsing sediment yield data: christian@4183: christian@4183: -Dflys.backend.importer.skip.sediment.yield=true christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared the christian@4183: importer to parse sediment yield data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentYield.java: christian@4183: storeDependencies() now throws SQLExceptions and christian@4183: ConstraintViolationExceptions. christian@4183: christian@4183: 2012-04-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGrainFraction.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentYieldValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentYield.java: New christian@4183: importer classes for importing sediment yield data. christian@4183: christian@4183: 2012-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SedimentYield.java, christian@4183: src/main/java/de/intevation/flys/model/SedimentYieldValue.java, christian@4183: src/main/java/de/intevation/flys/model/GrainFraction.java: New model christian@4183: classes for sediment yield data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes. christian@4183: christian@4183: 2012-04-18 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added missing river_id column to christian@4183: sediment_yield relation. christian@4183: christian@4183: 2012-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Floodmaps.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeZone.java: christian@4183: Removed superflous imports. christian@4183: christian@4183: 2012-04-18 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added relations for storing sediment christian@4183: yield values. christian@4183: christian@4183: 2012-04-18 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: The discharge_zone relation has no christian@4183: longer a reference to a named main value but stores a lower and upper christian@4183: discharge as string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DischargeZone.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeZone.java: christian@4183: Adapted the code to the changes in the db schema. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java: christian@4183: This parser now reads the meta information properly. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java: christian@4183: Repaired broken HQL statement. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: christian@4183: Log the number of flow velocity model values that have been written into christian@4183: database. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityMeasurementParser.java: christian@4183: New parser for flow velocity measurements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: christian@4183: Fixed broken HQL statements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Store flow christian@4183: velocity measurements into database after parsing them. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes for flow velocity measurements. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java: christian@4183: New temp classes used during the import process of flow velocity christian@4183: measurements. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FlowVelocityMeasurementValue.java, christian@4183: src/main/java/de/intevation/flys/model/FlowVelocityMeasurement.java: New christian@4183: model classes for storing flow velocity measurements. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific christian@4183: flow velocity measurements. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java: christian@4183: New. Parser for model files of MINFO specific flow velocity data. christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Added a missing q column to christian@4183: flow_velocity_model_values relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, christian@4183: src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java: christian@4183: Added missing q column. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: christian@4183: Added setter methods for meta data and an addValue() for adding new christian@4183: ImportFlowVelocityModelValues. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Use christian@4183: FlowVelocityModelParser for parsing model data of flow velocity files. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeZone.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java: christian@4183: Temp classes used during the import process of flow velocity data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented christian@4183: the method that stores flow velocity model data. christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared for christian@4183: parsing flow velocity files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a config christian@4183: option to skip parsing flow velocity files: christian@4183: christian@4183: -Dflys.backend.importer.skip.flow.velocity=true christian@4183: christian@4183: 2012-04-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FlowVelocityModel.java, christian@4183: src/main/java/de/intevation/flys/model/FlowVelocityModelValue.java, christian@4183: src/main/java/de/intevation/flys/model/DischargeZone.java: New model christian@4183: classes for MINFO specific database relations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the new model classes. christian@4183: christian@4183: 2012-04-16 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific christian@4183: flow velocity values. christian@4183: christian@4183: 2012-02-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Fixed column unit_id in table depths christian@4183: to match type of column id in table units. christian@4183: christian@4183: * doc/schema/postgresql-minfo.sql: oracle-minfo.sql for a better DBMS. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MorphologicalWidth.java: Added christian@4183: annotation for values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java: christian@4183: Removed debug output in getPeer() and storeDependencies(). christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/MorphologicalWidthParser.java: christian@4183: New parser for morphological widths files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: Throw christian@4183: constraint violation exceptions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Parse and christian@4183: store morphological widths. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a config christian@4183: option to skip parsing morphological widths: christian@4183: christian@4183: -Dflys.backend.importer.skip.morphological.width=true christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Added a description field to morphological christian@4183: width values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: christian@4183: Added new instance variable for descriptions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportMorphWidthValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportMorphWidth.java: New christian@4183: temp classes used to store morphological width values during the import. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Added new relations for MINFO specific christian@4183: morphological width. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MorphologicalWidth.java, christian@4183: src/main/java/de/intevation/flys/model/MorphologicalWidthValue.java: New christian@4183: model classes for morphological width. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model classes. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Added a description field to table christian@4183: sediment_density. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, christian@4183: src/main/java/de/intevation/flys/model/SedimentDensity.java: Some christian@4183: modifications based on the changes of the schema adaption in last commit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: christian@4183: Override parse() of parent class to get the filename. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDepth.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java: christian@4183: Implemented the methods storeDependencies() and getPeer() to save new christian@4183: instances into database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save all christian@4183: ImportSedimentDensity objects to database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the new model classes. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Modified the db schema specific to christian@4183: MINFO; replaced some columns. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: christian@4183: Implemented the method stubs: parse meta data and data values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java: christian@4183: Added and replaced some instance variables because the db schema has christian@4183: changed. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/LineParser.java: New. christian@4183: An abstract parser that might be used to read a file and handle each christian@4183: line contained in the file seperatly. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java: christian@4183: New. Subclasses LineParser. It is able to parse MINFO specific sediment christian@4183: density files. NOTE: currently just a stub. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Prepared to christian@4183: read MINFO specific sediment density files. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a new christian@4183: config option to skip parsing MINFO sediment density values: christian@4183: christian@4183: -Dflys.backend.importer.skip.sediment.density=true christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportSedimentDensityValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDepth.java: New importer christian@4183: classes used during MINFO sediment density import. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Improved the MINFO schema to store christian@4183: sediment density values specific to a river and depth. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/SedimentDensityValue.java, christian@4183: src/main/java/de/intevation/flys/model/SedimentDensity.java, christian@4183: src/main/java/de/intevation/flys/model/Depth.java: New model classes christian@4183: used to store sediment density values specific to a river and depth. christian@4183: christian@4183: 2012-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java: christian@4183: New. An abstract super class for BedHeightSingleParser and christian@4183: BedHeightEpochParser. It implements methods for parsing meta data. christian@4183: Concrete subclasses need to implements the method for parsing data rows christian@4183: only. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeight.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightValue.java: New. christian@4183: Interfaces that define some major methods which enables the BedHeightParser christian@4183: to parse both - single and epoch bed heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Moved the code for parsing meta data to BedHeightParser which is now the christian@4183: parent class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java: christian@4183: New. A further subclass of BedHeightParser for parsing MINFO bed heights christian@4183: for epochs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java: christian@4183: Made them subclasses of ImportBedHeightValue. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Made christian@4183: them subclasses of ImportBedHeight. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Some christian@4183: adjustments to store ImportBedHeight and ImportBedHeightValue instances christian@4183: instead of concrete subclasses. christian@4183: christian@4183: 2012-04-12 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql: Added a link to the river to bed_height_epoch christian@4183: table. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightEpochValue.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightEpoch.java: New model christian@4183: classes for MINFO bed height epochs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Splitted up the christian@4183: config option to skip parsing bed heights. Now, we are able to skip single christian@4183: and epoch bed heights using the following options: christian@4183: christian@4183: -Dflys.backend.importer.skip.bed.height.single=true (skip singles) christian@4183: -Dflys.backend.importer.skip.bed.height.epoch=true (skip epochs) christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpochValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented christian@4183: the whole stuff to parse those data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the new model classes. christian@4183: christian@4183: 2012-04-12 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Schema adaptions specific to MINFO bed christian@4183: heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/BedHeightSingleValue.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightType.java, christian@4183: src/main/java/de/intevation/flys/model/ElevationModel.java, christian@4183: src/main/java/de/intevation/flys/model/LocationSystem.java, christian@4183: src/main/java/de/intevation/flys/model/BedHeightSingle.java: New model christian@4183: classes for MINFO bed heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Some logging adjustments and a little bugfix: add BedHeightSingle objects christian@4183: after they were parsed; otherwise they are not saved to database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportElevationModel.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightType.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: Implemented christian@4183: storeDependencies() and getPeer(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered model classes. christian@4183: christian@4183: 2012-04-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Finished work on parsing meta information and data specific to single bed christian@4183: heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingleValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportElevationModel.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportLocationSystem.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightType.java: Some christian@4183: new and modified temp storages used during MINFO import. christian@4183: christian@4183: 2012-04-11 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: Some schema adaptions specific to bed christian@4183: heights in MINFO. christian@4183: christian@4183: 2012-04-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added new command christian@4183: line option to skip parsing bed heights (german "Sohlhoehen"). christian@4183: Set "-Dflys.backend.importer.skip.bed.height=true" to skip parsing this christian@4183: file type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/BedHeightEpochParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/BedHeightSingleParser.java: christian@4183: Initial checkin of parsers for bed heights (single and epoch). christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java: Temp christian@4183: storage for bed heights data used during the import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: Added an INFO christian@4183: statement that signals the start of parsing rivers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Collect and christian@4183: trigger parsing of bed heights files (placed in 'Morphologie/Sohlhoehen'). christian@4183: christian@4183: 2012-04-11 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-minfo.sql, christian@4183: doc/schema/oracle-drop-minfo.sql: MINFO specific DB schema and sql statements christian@4183: to drop MINFO specific stuff. christian@4183: christian@4183: 2012-03-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: Added a config christian@4183: option "flys.backend.importer.infogew.file" to set the path of an christian@4183: INFO.gew file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: Read the path christian@4183: to the INFO.gew from the new config option and try to parse it. christian@4183: christian@4183: 2012-03-19 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Set the type of 'lower' and 'upper' column christian@4183: of relation 'dem' to NUMBER(19,5). christian@4183: christian@4183: 2012-03-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Floodmaps.java: Set geometry type christian@4183: to 'Geometry', because Oracle can save POLYGONS and MULTIPOLYGONS in the christian@4183: same relation; Hibernate seems unable to load both types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered missing Floodmaps. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as 'pre2.7-2012-03-16'. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Repaired broken oracle db schema for christian@4183: relation 'floodmaps'. christian@4183: christian@4183: 2012-03-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Floodmaps.java: New model class for christian@4183: 'floodmaps'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the Floodmaps model class. christian@4183: christian@4183: 2012-03-07 Ingo Weinzierl christian@4183: christian@4183: * contrib/shpimporter/shpimporter.py, christian@4183: contrib/shpimporter/utils.py, christian@4183: contrib/shpimporter/uesg.py: A python based tool for importing christian@4183: shapefiles into a database. This tool is based on python because it christian@4183: makes use of GDAL OGR to read shapefiles and write features into christian@4183: database. christian@4183: christian@4183: 2012-03-07 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Adapted the PostgreSQL schema for christian@4183: floodmaps. christian@4183: christian@4183: 2012-03-06 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql, christian@4183: doc/schema/oracle-spatial.sql: Added new relations for existing christian@4183: floodmaps (currently tested for PostgreSQL only!). christian@4183: christian@4183: 2012-03-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: Adapted method call of christian@4183: Log4J logger 'warning()' -> 'warn()'. christian@4183: christian@4183: 2012-03-02 Felix Wolfsteller christian@4183: christian@4183: Fix or workaround flys/issue632 . christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: Avoid NPE when christian@4183: trying to get min/max q values. christian@4183: christian@4183: 2012-02-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DischargeTable.java: christian@4183: The list of DischargeTableValue is now sorted by Q. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: Added a method christian@4183: getMasterDischargeTable() to retrieve the discharge table with kind 0. christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java christian@4183: (getGaugeDatumsKMs,queryGaugeDatumsKMs): renamed to avoid hibernate christian@4183: running into trouble finding db-mapping for type Map for christian@4183: what looks like a 'getter' of GaugeDatumsKMs. christian@4183: christian@4183: 2012-02-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java(getGaugeDatumsKMs): christian@4183: New method to build a map of gauge stattion km to christian@4183: the datums (PNP) of the gauge. Useful look if a km christian@4183: is a gauge station. christian@4183: christian@4183: 2012-01-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastAnnotations.java: christian@4183: New. Fetches all informations of annotations in one go for christian@4183: a river. Useful to speed up annotation handling. christian@4183: christian@4183: 2012-01-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: Added a function that christian@4183: returns a Gauge based on its official number. christian@4183: christian@4183: 2012-01-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/FastCrossSectionLine.java: christian@4183: New. Cacheable representation of the cross section line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: christian@4183: Add a new isValid() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java: christian@4183: Added method getFastLines() to fetch the lines (FastCrossSectionLines) christian@4183: directly with a single SQL statement and without expensive christian@4183: intermediate representations. christian@4183: christian@4183: 2012-01-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java(getLines): christian@4183: Added method to fetch the lines of a cross section in a given interval. christian@4183: Useful to have chunked access to the lines. christian@4183: christian@4183: 2012-01-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionLine.java christian@4183: (fetchCrossSectionLinesPoints): Simplified and prevent reallocations. christian@4183: christian@4183: 2012-01-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: christian@4183: Introduced boolean system property 'flys.backend.sta.parse.gauge.numbers' christian@4183: default: false. If set the official number is parsed out of christian@4183: the first line of the STA files. This leads to problems with the christian@4183: data of the Elbe river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Removed christian@4183: superfluous import. christian@4183: christian@4183: 2012-01-05 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Fixed table hws. christian@4183: christian@4183: 2012-01-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/RiverAxis.java: The method christian@4183: getRiverAxis() now returns a list of RiverAxis objects. There is a christian@4183: modeling problem (see comment in the header of the class) which should christian@4183: be fixed! christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Adapted the christian@4183: code based on the modified signature in RiverAxis. christian@4183: christian@4183: 2012-01-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: Added a method christian@4183: determineMinMaxQFree() that determines the min/max Qs at a given christian@4183: kilometer. christian@4183: christian@4183: 2012-01-02 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Remove 'NOT NULL' constraint from christian@4183: gauges.range_id because there are gauges which don't have christian@4183: a 'Gueltigkeitsbereich' christian@4183: christian@4183: To adjust existing PostgreSQL databases use: christian@4183: christian@4183: ALTER TABLE gauges ALTER COLUMN range_id DROP NOT NULL; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Handle christian@4183: null references to 'Gueltigkeitsbereiche'. christian@4183: christian@4183: 2011-12-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: Added a method christian@4183: determineMinMaxQ(double double) to be able to determine the Q range of a christian@4183: WST without having a Range object. christian@4183: christian@4183: 2011-12-19 Sascha L. Teichmann : christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java: christian@4183: Parse the official 'Pegelnummer' out of the STA files, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Adjusted import model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: Make the christian@4183: official gauge number accessible via Hibernate. christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/oracle.sql: Added christian@4183: an official_number to the gauges table. christian@4183: christian@4183: 2011-11-30 Bjoern Schilberg : christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Adjust extent of germany to EPSG:31467 christian@4183: (GK3) coordinates. christian@4183: christian@4183: 2011-11-30 Bjoern Schilberg : christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Adjust extent to the extent of germany christian@4183: and srs to 31467 in USER_SDO_GEOM_METADATA. christian@4183: christian@4183: 2011-11-29 Bjoern Schilberg : christian@4183: christian@4183: * doc/schema/oracle_create_user.sql: Fixed notation of the table in the christian@4183: alter statement. christian@4183: christian@4183: 2011-11-18 Sascha L. Teichmann : christian@4183: christian@4183: Fixed flys/issue415 christian@4183: christian@4183: * doc/schema/oracle.sql: Increased precision of a and b in ranges. christian@4183: christian@4183: 2011-11-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Building.java, christian@4183: src/main/java/de/intevation/flys/model/Fixpoint.java: Added functions christian@4183: that return a list of Buildings/Fixpoints for a given river. christian@4183: christian@4183: 2011-11-10 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/oracle-spatial.sql, christian@4183: doc/schema/postgresql-spatial.sql: Adapted the "kind" field of "lines" christian@4183: relation (Int -> Varchar). christian@4183: christian@4183: * doc/schema/oracle-spatial_idx.sql: Added missing spatial index for christian@4183: "lines" relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Line.java: Added a function that christian@4183: returns all lines of a given river. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Catchment.java: New. A model for christian@4183: the 'catchment' relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the Catchment model. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Synced "hws" relation with oracle christian@4183: schema. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Hws.java: New. A model for the christian@4183: "hws" relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the Hws model. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Added methods that return information about the database connection used christian@4183: by a concrete SessionFactoryImpl. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Floodplain.java: Changed the christian@4183: geometry type from MultiPolygon to Polygon. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Added a function that returns the db driver of a given christian@4183: SessionFactoryImpl instance. christian@4183: christian@4183: 2011-11-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/RiverAxisKm.java: New. Model class christian@4183: for 'river_axes_km' relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Added mapping for RiverAxisKm. christian@4183: christian@4183: 2011-10-25 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle_create_user.sql: christian@4183: Added explizit TABLESPACE definition for the user. christian@4183: christian@4183: 2011-10-25 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle_create_user.sql: christian@4183: Adjusted oracle_create_user.sql script. Added USER SQL snippet to change christian@4183: tablespace to users. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann : christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DateGuesser.java: christian@4183: New. Date guesser from desktop FLYS. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: christian@4183: Try to parse the name of a WST column as a date and store christian@4183: the date into the database christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Added code to store the date of the column in the database. christian@4183: christian@4183: 2011-10-24 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: christian@4183: Adjusted geometry type for floodplain and hws in AddGeometryColumn. christian@4183: christian@4183: 2011-10-19 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: christian@4183: Added missing views (wst_value_table,wst_w_values,wst_q_values). christian@4183: christian@4183: 2011-10-18 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: christian@4183: Removed all CREATE OR REPLACE TRIGGER statements. christian@4183: christian@4183: 2011-10-17 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: christian@4183: Adjusted NUMBER format for units, positions and cross_section_points tables. christian@4183: christian@4183: 2011-10-10 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: christian@4183: Fix errors. christian@4183: christian@4183: 2011-10-10 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: christian@4183: Adjust oracle schema [I382]. christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportUnit.java: christian@4183: Removed obsolete imports. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann : christian@4183: christian@4183: * ChangeLog: Added database update statements. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: BEGIN; christian@4183: CREATE SEQUENCE UNITS_ID_SEQ; christian@4183: CREATE TABLE units ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: name VARCHAR(32) NOT NULL UNIQUE christian@4183: ); christian@4183: ALTER TABLE rivers ADD COLUMN wst_unit_id int REFERENCES units(id); christian@4183: INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NN + m'); christian@4183: INSERT INTO units (id, name) VALUES (nextval('UNITS_ID_SEQ'), 'NHN + m'); christian@4183: UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NHN + m') WHERE name = 'Elbe'; christian@4183: UPDATE rivers SET wst_unit_id = (SELECT id FROM units WHERE name = 'NN + m') WHERE name <> 'Elbe'; christian@4183: ALTER TABLE rivers ALTER COLUMN wst_unit_id SET NOT NULL; christian@4183: COMMIT; christian@4183: christian@4183: 2011-10-05 Ingo Weinzierl christian@4183: christian@4183: * contrib/dump-schema.sh: New. A small shell script that dumps the christian@4183: database schema of a given database to SQL. christian@4183: christian@4183: * pom.xml: Added dependency for hibernate-spatial-oracle stuff. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql.sql: Removed unit column from wsts; added a christian@4183: wst_unit_id column to rivers. We decided to support a single elevation christian@4183: model for the whole river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Added a WstUnit christian@4183: column. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: Removed the Unit christian@4183: column. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java: Provide a christian@4183: getUnit() method that allows querying the elevation unit for this wst. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportUnit.java: Removed christian@4183: storeDependencies(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: Save the christian@4183: Unit of the wst file or a default one into database before all other christian@4183: dependencies as well as the river itself is saved to database. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql.sql: Added a "units" table. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Unit.java: New. Model class that christian@4183: represents a unit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportUnit.java: New. Model christian@4183: class that is used to import units. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: A Wst stores a Unit christian@4183: which references "units" table now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/WstParser.java: Set christian@4183: units which have already been parsed on Wsts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java: Added setter christian@4183: method for Units and call storeDependencies() for ImportUnits. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model class Unit. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: flys/issue333 (W-INFO / Berechnung Wasserspiegellage, Zuordnung Bezugspegel) christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Modified christian@4183: determination of gauge based on a km range. River.determineGauge(double, christian@4183: double) will now return the gauge which matches the start km. christian@4183: christian@4183: 2011-09-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/StringUtil.java: christian@4183: (wWrap): New method (extracted from WaterlevelSelectState). christian@4183: christian@4183: 2011-09-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/StringUtil.java: christian@4183: (unbracket): New method (extracted from WaterlevelSelectState). christian@4183: christian@4183: 2011-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: christian@4183: Moved some logic from cross section demo app to this model. christian@4183: christian@4183: 2011-09-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: christian@4183: Added new function that the nearest CrossSectionTrack of a river to a christian@4183: given kilometer. christian@4183: christian@4183: 2011-09-23 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: christian@4183: Added missing river_axes_km schema. christian@4183: * doc/schema/oracle-spatial.sql: christian@4183: Added missing dem and lines schema. christian@4183: christian@4183: 2011-09-22 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql, doc/schema/oracle-spatial.sql: christian@4183: Harmonized oracle and postgresql spatial schema. christian@4183: christian@4183: 2011-09-22 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Harmonized Extent for Saar and Mosel. Some cleanups. christian@4183: christian@4183: 2011-09-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Added the possibility to enable JMX (/MBean) support for hibernate. By christian@4183: default, this support is NOT enabled. To enable JMX support for christian@4183: hibernate, set the system property "flys.backend.enablejmx=true". christian@4183: christian@4183: 2011-09-20 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle_create_user.sql: Added right to create views. christian@4183: christian@4183: 2011-09-20 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Generalized oracle spatial schema. christian@4183: christian@4183: 2011-09-19 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.5 christian@4183: christian@4183: * Changes: Prepared changes for release. christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DGM.java: Added function to query christian@4183: a DGM by Id. christian@4183: christian@4183: 2011-09-15 Bjoern Schilberg christian@4183: christian@4183: * pom.xml: Removed oracle dependency. christian@4183: christian@4183: 2011-09-15 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle.sql: Added inital oracle schema. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial_idx.sql: Added inital oracle-spatial_idx.sql christian@4183: script. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Deactivated spatial indexes. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle_create_user.sql: Added inital oracle_create_user.sql christian@4183: script. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema floodplain. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema hws. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema cross_section_tracks. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema river_axes. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema fixpoints. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added schema buildings. christian@4183: christian@4183: 2011-09-14 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Fixed table river_axes_km. christian@4183: christian@4183: 2011-09-13 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/oracle-spatial.sql: Added initial oracle schemas. christian@4183: christian@4183: 2011-09-12 Bjoern Schilberg christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Added initial schemas for christian@4183: Hydrologie/Einzugsgebiete, Hydrologie/HW-Schutzanlagen, Hydrologie/Hydr. christian@4183: Grenzen/Linien, BfG/hauptoeff_*.shp, BfG/MNQ-*.shp, christian@4183: BfG/modellgrenze*.shp, BfG/uferlinie.shp, BfG/vorland_*.shp, christian@4183: Hydrologie/Streckendaten, Hydrologie/UeSG/Berechnung, christian@4183: Hydrologie/UeSG/Messung christian@4183: christian@4183: 2011-09-02 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Removed SERIALs from schema. christian@4183: Auto-Increment is realized through SERIALs now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DGM.java: The table for dem has christian@4183: been renamed to 'dem' (before 'dgm'). christian@4183: christian@4183: 2011-09-01 Hans Plum christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: christian@4183: Hint for unifying table names: dgm -> dem christian@4183: christian@4183: 2011-09-01 Hans Plum christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: christian@4183: Added mappings to existing data in file system (based on christian@4183: river Saar); added TODOs for missing tables/mappings christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: New relation for floodplains (german christian@4183: "Talaue"). christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Floodplain.java: New. Model class christian@4183: that represents a floodplain. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the Floodplain mapping. christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: Added a relation for DGMs. Note, that christian@4183: no data of the DGM is stored in this relation, but only the file path to christian@4183: the DGM file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DGM.java: New. This class provides christian@4183: information for a DGM (km range and file path). christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the DGM. christian@4183: christian@4183: 2011-08-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java: New christian@4183: static function to retrieve all CrossSectionTracks of a specific river. christian@4183: christian@4183: 2011-08-25 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FileTools.java: Moved to christian@4183: artifacts-common module. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/PegelGltParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/PRFParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/AnnotationsParser.java, christian@4183: src/main/java/de/intevation/flys/importer/parsers/InfoGewParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportGauge.java: Adjusted christian@4183: imports of FileTools. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java (getMainValues) christian@4183: (setMainValues): christian@4183: New method and mapping to get/set MainValues of a Gauge. Essentially christian@4183: developed by Sascha L. Teichmann. christian@4183: christian@4183: 2011-08-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Reverted the default db dialect to PostgreSQL - this has been changed to christian@4183: PostGIS by accident. christian@4183: Configure the dialect "org.hibernatespatial.postgis.PostgisDialect" to christian@4183: use the PostGIS stuff. christian@4183: christian@4183: 2011-08-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/RiverAxis.java: Added a function christian@4183: that returns the RiverAxis for a given River. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SpatialInfo.java: Use the new christian@4183: function of RiverAxis to retrieve the RiverAxis. christian@4183: christian@4183: 2011-08-18 Ingo Weinzierl christian@4183: christian@4183: * doc/schema/postgresql-spatial.sql: The PostGIS database schema for christian@4183: FLYS spatial data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionTrack.java, christian@4183: src/main/java/de/intevation/flys/model/RiverAxis.java, christian@4183: src/main/java/de/intevation/flys/model/Line.java, christian@4183: src/main/java/de/intevation/flys/model/Building.java, christian@4183: src/main/java/de/intevation/flys/model/Fixpoint.java: Model classes that christian@4183: represent FLYS spatial data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered model classes. christian@4183: christian@4183: * pom.xml: Added dependencies to HibernateSpatial and PostGIS. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SpatialInfo.java, christian@4183: contrib/spatial-info.sh: A small demo application that prints out some christian@4183: information about spatial data of specific rivers. Modify the system christian@4183: property -Dflys.backend.spatial.river to get information of a river of christian@4183: your choice. christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: Re-enabled Hibernate schema dumps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Removed old code christian@4183: and use new SessionFactoryProvider infrastructure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Added methods to create db configurations without opening them. christian@4183: Useful for introspection only purposes. christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Bumped Apache DBCP up to 1.4 to use the same version christian@4183: as artifact database. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Make use of the LRU cache from artifacts common. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added missing foreign key contraint on hyks table. christian@4183: To update existing databases: christian@4183: christian@4183: ALTER TABLE hyks ADD CONSTRAINT hyks_river_id_fkey FOREIGN KEY (river_id) REFERENCES rivers(id); christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: christian@4183: Check if zone coordinates in HYKs are swapped and warn the user. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYK.java christian@4183: src/main/java/de/intevation/flys/importer/parsers/HYKParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYK.java: christian@4183: Various small fixes and some extra logging. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Config.java: New. christian@4183: Central singleton to configure the Importer. christian@4183: Uses system properties by now: christian@4183: christian@4183: flys.backend.importer.dry.run: boolean christian@4183: default false. true: don't write to database. christian@4183: christian@4183: flys.backend.importer.annotation.types: String christian@4183: default unset. Filename of annotation type classifications. christian@4183: christian@4183: flys.backend.importer.skip.gauges: boolean christian@4183: default: false. true: don't parse/store *.glt, *.sta files christian@4183: christian@4183: flys.backend.importer.skip.annotations: boolean christian@4183: default: false. true: don't parse/store *.km files christian@4183: christian@4183: flys.backend.importer.skip.prfs: boolean christian@4183: default: false. true: don't parse/store *.prf files christian@4183: christian@4183: flys.backend.importer.skip.hyks: boolean christian@4183: default: false. true: don't parse/store *.hyk files christian@4183: christian@4183: flys.backend.importer.skip.wst: boolean christian@4183: default: false. true: don't parse/store river wst files christian@4183: christian@4183: flys.backend.importer.skip.extra.wsts: boolean christian@4183: default: false. true: don't parse/store extra *.zus, *.wst files christian@4183: christian@4183: flys.backend.importer.skip.fixations: boolean christian@4183: default: false. true: don't parse/store fixation *.wst files christian@4183: christian@4183: flys.backend.importer.skip.official.lines: boolean christian@4183: default: false. true: don't parse/store 'amtliche Linien' *.wst files christian@4183: christian@4183: flys.backend.importer.skip.flood.water: boolean christian@4183: default: false. true: don't parse/store 'HW-Marken' *.wst files christian@4183: christian@4183: flys.backend.importer.skip.flood.protection: boolean christian@4183: default: false. true: don't parse/store 'HW-Schutzanlagen' *.wst files christian@4183: christian@4183: 2011-07-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYKEntry.java: Fixed OrderBy christian@4183: clause. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYK.java: christian@4183: Store HYK data structures to database. Needs testing. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse the HYKs from the importer. TODO: Store them in database. christian@4183: christian@4183: 2011-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: christian@4183: Create data structures while parsing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYK.java: Added christian@4183: getters/setters to ease model wiring. christian@4183: christian@4183: 2011-07-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportHYKFormation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYKEntry.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportHYK.java: New. christian@4183: Importer models for HYKs. christian@4183: christian@4183: 2011-07-17 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Each entry in a HYK can have christian@4183: an optional 'Peilungsjahr' (measure) not only the whole HYK. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: ALTER TABLE hyks DROP COLUMN measure; christian@4183: ALTER TABLE hyk_entries ADD COLUMN measure TIMESTAMP; christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYKEntry.java, christian@4183: src/main/java/de/intevation/flys/model/HYK.java: christian@4183: Adjusted Hibernate models. christian@4183: christian@4183: 2011-07-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: christian@4183: Added callback mechanism and recursive file search like in the PRF parser. christian@4183: All BfG-HYK files seem to parse correctly now. TODO: Build the data structures. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: christian@4183: Added x.canRead() before accepting files for parsing. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/HYKParser.java: christian@4183: Initial version of the HYK parser. Not ready, yet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportHYKFlowZoneType.java: christian@4183: Importer model for HYK flow zone types. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Argh! Added distance_{vl|hf|vr} to christian@4183: wrong table. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: ALTER TABLE hyk_entries DROP COLUMN distance_vl; christian@4183: ALTER TABLE hyk_entries DROP COLUMN distance_hf; christian@4183: ALTER TABLE hyk_entries DROP COLUMN distance_vr; christian@4183: ALTER TABLE hyk_formations ADD COLUMN distance_vl NUMERIC NOT NULL; christian@4183: ALTER TABLE hyk_formations ADD COLUMN distance_hf NUMERIC NOT NULL; christian@4183: ALTER TABLE hyk_formations ADD COLUMN distance_vr NUMERIC NOT NULL; christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYKFormation.java, christian@4183: src/main/java/de/intevation/flys/model/HYKEntry.java: christian@4183: Adjusted Hibernate models. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FileTools.java: Added method christian@4183: walkTree() to traverse a directory tree. To be reused in HYK parser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/PRFParser.java: christian@4183: Uses the FileTools.walkTree() method now to find all PRF file. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added missing columns. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: ALTER TABLE hyks ADD COLUMN measure TIMESTAMP; christian@4183: ALTER TABLE hyk_entries ADD COLUMN distance_vl NUMERIC NOT NULL; christian@4183: ALTER TABLE hyk_entries ADD COLUMN distance_hf NUMERIC NOT NULL; christian@4183: ALTER TABLE hyk_entries ADD COLUMN distance_vr NUMERIC NOT NULL; christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYKEntry.java, christian@4183: src/main/java/de/intevation/flys/model/HYK.java: christian@4183: Adjusted Hibernate models. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/parsers/*.java: christian@4183: New package. Moved the file parsers (*.gew, *.sta, *.at, *.glt, *.prf, *.km, *.wst) christian@4183: into this package. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/*.java: Adjusted the imports. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/HYKFormation.java, christian@4183: src/main/java/de/intevation/flys/model/HYKEntry.java, christian@4183: src/main/java/de/intevation/flys/model/HYKFlowZone.java, christian@4183: src/main/java/de/intevation/flys/model/HYKFlowZoneType.java, christian@4183: src/main/java/de/intevation/flys/model/HYK.java: New. The hibernate models christian@4183: for the HYK structures. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new models. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java: Added christian@4183: 'order by' annotation for fetching the cross section lines. christian@4183: christian@4183: 2011-07-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added structures for HYKs "Hydraulische Kenngroessen" christian@4183: To update existing databases: christian@4183: christian@4183: BEGIN; christian@4183: CREATE SEQUENCE HYKS_ID_SEQ; christian@4183: CREATE TABLE hyks ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: river_id int NOT NULL, christian@4183: description VARCHAR(256) NOT NULL christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE HYK_ENTRIES_ID_SEQ; christian@4183: CREATE TABLE hyk_entries ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: hyk_id int NOT NULL REFERENCES hyks(id), christian@4183: km NUMERIC NOT NULL, christian@4183: UNIQUE (hyk_id, km) christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE HYK_FORMATIONS_ID_SEQ; christian@4183: CREATE TABLE hyk_formations ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: formation_num int NOT NULL DEFAULT 0, christian@4183: hyk_entry_id int NOT NULL REFERENCES hyk_entries(id), christian@4183: top NUMERIC NOT NULL, christian@4183: bottom NUMERIC NOT NULL, christian@4183: UNIQUE (hyk_entry_id, formation_num) christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE HYK_FLOW_ZONE_TYPES_ID_SEQ; christian@4183: CREATE TABLE hyk_flow_zone_types ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: name VARCHAR(50) NOT NULL UNIQUE, christian@4183: description VARCHAR(256) christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE HYK_FLOW_ZONES_ID_SEQ; christian@4183: CREATE TABLE hyk_flow_zones ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: formation_id int NOT NULL REFERENCES hyk_formations(id), christian@4183: type_id int NOT NULL REFERENCES hyk_flow_zone_types(id), christian@4183: a NUMERIC NOT NULL, christian@4183: b NUMERIC NOT NULL, christian@4183: CHECK (a <= b) christian@4183: ); christian@4183: COMMIT; christian@4183: christian@4183: 2011-07-13 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Bumped Hibernate up to 3.6.5. christian@4183: christian@4183: 2011-07-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FileTools.java: Argh! christian@4183: Forget to call the file hashing so only the file lengths were christian@4183: compared. christian@4183: christian@4183: 2011-07-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FileTools.java: christian@4183: Added a class HashedFile to compare files by there length christian@4183: and a message digest. Digest can be set with system property christian@4183: "flys.backend.file.cmp.digest" and defaults to MD5. Useful to christian@4183: detect file duplicates. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: Added christian@4183: method prfAccept(File) to callback to check if a found PRF file christian@4183: should be parsed. Useful to prevent parsing file duplicates. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Use the HashedFile and the PRFParser.Callback to prevent christian@4183: parsing of PRF duplicates. christian@4183: christian@4183: 2011-07-08 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Misspelled sequence. christian@4183: To update existing databases: christian@4183: christian@4183: DROP SEQUENCE CROSS_SECTION_LINES_SEQ; christian@4183: CREATE SEQUENCE CROSS_SECTION_LINES_ID_SEQ; christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportCrossSection.java: christian@4183: Added some logging because importing is slow. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: christian@4183: Prevent NPE if a cross section line from db has no points. christian@4183: christian@4183: 2011-07-08 Sascha L. Teichmann christian@4183: christian@4183: Parse all PRFs in all subfolders of a river and store them christian@4183: as cross sections into the database. Needs testing! christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportCrossSection.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportCrossSectionLine.java: christian@4183: New. Importer models for cross sections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/XY.java: christian@4183: New. Made top level class from inner PRFParser.XY. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: christian@4183: Moved out XY class. Renamed callback. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java, christian@4183: src/main/java/de/intevation/flys/model/CrossSectionLine.java, christian@4183: src/main/java/de/intevation/flys/model/CrossSectionPoint.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: christian@4183: Added convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse and store cross sections into database. christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Introduced a new table cross_section_line christian@4183: holding the km of a set of points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionLine.java: christian@4183: New. Model for a single line of a "Querprofil". christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java: Removed christian@4183: 'km' and 'points' they are part of the line now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: christian@4183: They reference to the containing line now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered new model. christian@4183: christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: DROP SEQUENCE CROSS_SECTIONS_ID_SEQ; christian@4183: DROP SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; christian@4183: DROP TABLE cross_section_points; christian@4183: DROP TABLE cross_sections; christian@4183: CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; christian@4183: CREATE TABLE cross_sections ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: river_id int NOT NULL REFERENCES rivers(id), christian@4183: time_interval_id int REFERENCES time_intervals(id), christian@4183: description VARCHAR(256) christian@4183: ); christian@4183: CREATE SEQUENCE CROSS_SECTION_LINES_SEQ; christian@4183: CREATE TABLE cross_section_lines ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: km NUMERIC NOT NULL, christian@4183: cross_section_id int NOT NULL REFERENCES cross_sections(id), christian@4183: UNIQUE (km, cross_section_id) christian@4183: ); christian@4183: CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; christian@4183: CREATE TABLE cross_section_points ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: cross_section_line_id int NOT NULL REFERENCES cross_section_lines(id), christian@4183: col_pos int NOT NULL, christian@4183: x NUMERIC NOT NULL, christian@4183: y NUMERIC NOT NULL, christian@4183: UNIQUE (cross_section_line_id, col_pos) christian@4183: ); christian@4183: COMMIT; christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Dropped constraint that enforces the christian@4183: uniqueness of km and river. This is violated because there are christian@4183: more than one sounding in different year at the same km of a river. christian@4183: Added column 'description' to the cross section table to make it christian@4183: human readable. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: ALTER TABLE cross_sections DROP CONSTRAINT cross_sections_km_key; christian@4183: ALTER TABLE cross_sections ADD COLUMN description VARCHAR(256); christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java: christian@4183: Added the description column to the Hibernate model. christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Dropped constraint that enforces the christian@4183: uniqueness of x in a "Querprofil-Spur". There are vertical lines christian@4183: in the soundings so this constraint is violated. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: ALTER TABLE cross_section_points DROP CONSTRAINT cross_section_points_cross_section_id_key2; christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: christian@4183: Added a callback to be called from parsePRFs() if christian@4183: a PRF was parsed successfully. Useful to scan whole christian@4183: sub directories for PRF files. christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: christian@4183: Extract the year of sounding from file names. If not found christian@4183: from the name of th containing directory. Description is made christian@4183: of file name and parent directory file name. christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: christian@4183: Extracted the data. All BfG PRFs are parsed correctly, now. christian@4183: christian@4183: 2011-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: christian@4183: Extract km from lines. TODO: extract data. christian@4183: christian@4183: 2011-07-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PRFParser.java: New. christian@4183: Parser for PRF files. TODO extra data and station from data lines. christian@4183: christian@4183: 2011-07-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Point3d.java: Deleted. christian@4183: Not needed (braindead). christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSectionPoint.java: christian@4183: Directly store the x/y values now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Removed registration of Point3d. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: BEGIN; christian@4183: ALTER TABLE cross_section_points DROP COLUMN point3d_id; christian@4183: DROP SEQUENCE POINTS3D_ID_SEQ; christian@4183: DROP TABLE points3d; christian@4183: ALTER TABLE cross_section_points ADD COLUMN x NUMERIC NOT NULL; christian@4183: ALTER TABLE cross_section_points ADD COLUMN y NUMERIC NOT NULL; christian@4183: ALTER TABLE cross_section_points ADD CONSTRAINT christian@4183: cross_section_points_cross_section_id_key2 UNIQUE (cross_section_id, x); christian@4183: COMMIT; christian@4183: christian@4183: 2011-07-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/CrossSection.java, christian@4183: src/main/java/de/intevation/flys/model/CrossSectionPoint.java: christian@4183: New. Hibernate models for cross-sections and their forming points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered the new models. christian@4183: christian@4183: 2011-07-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Registered point3d model. christian@4183: christian@4183: 2011-07-06 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Add relations for cross sections. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: christian@4183: CREATE SEQUENCE CROSS_SECTIONS_ID_SEQ; christian@4183: CREATE TABLE cross_sections ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: km NUMERIC NOT NULL, christian@4183: river_id int NOT NULL REFERENCES rivers(id), christian@4183: time_interval_id int REFERENCES time_intervals(id), christian@4183: UNIQUE (km, river_id) christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE POINTS3D_ID_SEQ; christian@4183: CREATE TABLE points3d ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: x NUMERIC NOT NULL, christian@4183: y NUMERIC NOT NULL, christian@4183: z NUMERIC NOT NULL christian@4183: ); christian@4183: christian@4183: CREATE SEQUENCE CROSS_SECTION_POINTS_ID_SEQ; christian@4183: CREATE TABLE cross_section_points ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: cross_section_id int NOT NULL REFERENCES cross_sections(id), christian@4183: point3d_id int NOT NULL REFERENCES points3d(id), christian@4183: col_pos int NOT NULL, christian@4183: UNIQUE (cross_section_id, point3d_id, col_pos), christian@4183: UNIQUE (cross_section_id, col_pos) christian@4183: ); christian@4183: christian@4183: COMMIT; christian@4183: christian@4183: 2011-06-28 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.4 christian@4183: christian@4183: 2011-06-27 Ingo Weinzierl christian@4183: christian@4183: * Changes: Prepared changes for the upcoming release. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, christian@4183: src/main/java/de/intevation/flys/importer/AnnotationClassifier.java, christian@4183: src/main/java/de/intevation/flys/importer/AtFileParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ValueKey.java, christian@4183: src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added a method maxOverlap to determine the gauge which has christian@4183: the max common length to a given interval. This is for christian@4183: numerical stability in slightly overlapping gauge ranges. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: When christian@4183: looking up a gauge by km containment use precision of 1e-6. christian@4183: christian@4183: 2011-06-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added method to find gauge by its name. christian@4183: christian@4183: 2011-06-19 Sascha L. Teichmann christian@4183: christian@4183: * doc/annotation-types.xml: Fixed some rules. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java, christian@4183: src/main/java/de/intevation/flys/importer/InfoGewParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Call the right constructors now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: christian@4183: Added getter/setter for name property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: christian@4183: Print duplicated at WARN level not as DEBUG. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: christian@4183: Fixed XPath expression to build the internal lookup structures christian@4183: correctly. christian@4183: christian@4183: 2011-06-19 Sascha L. Teichmann christian@4183: christian@4183: Added classification of annotation types. Needs testing! christian@4183: christian@4183: * doc/annotation-types.xml: New. Rules to classify the different christian@4183: types of annotations. The classification works like this: christian@4183: christian@4183: There are unique types like 'Bruecke', 'Pegel' and so on. christian@4183: They are defined in the /annotation/type section and christian@4183: identified by their name. One of the types can be set christian@4183: as the default type if no rule applies. christian@4183: christian@4183: In the /annotation/pattern section are two types of pattern. christian@4183: christian@4183: 1 - file pattern: If a KM file is opened its filename is christian@4183: matched against the regular expressions of these christian@4183: patterns. If a match is found the corresponding type christian@4183: is used as the default type in the open file. christian@4183: If no match is found the global default type is used christian@4183: as the default type. christian@4183: christian@4183: 2 - line patterns: For each line of an open KM file these christian@4183: patterns are applied to find a match. If a match is christian@4183: found the corresponding type is used as the type of christian@4183: the annotation. If no match is found the default christian@4183: file default is assumed to be the right type. For christian@4183: the file default see 1. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: To activate the annotation type classification set christian@4183: the system property christian@4183: christian@4183: 'flys.backend.importer.annotation.types' christian@4183: christian@4183: to the path of a XML looking like the annotation-types.xml christian@4183: file. If the system property is not set no classification christian@4183: is done. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java: christian@4183: New. Implements the classification. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, christian@4183: src/main/java/de/intevation/flys/importer/InfoGewParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Looped through the annotation type classification. christian@4183: christian@4183: 2011-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added method to find gauge by a position lying in its range. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: First part of flys/issue18 christian@4183: christian@4183: * doc/schema/postgresql.sql: Add new table 'annotation_types'. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: CREATE SEQUENCE ANNOTATION_TYPES_ID_SEQ; christian@4183: CREATE TABLE annotation_types ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: name VARCHAR(256) NOT NULL UNIQUE christian@4183: ); christian@4183: ALTER TABLE annotations ADD COLUMN type_id int REFERENCES annotation_types(id); christian@4183: COMMIT; christian@4183: christian@4183: * doc/schema/postgresql-cleanup.sql: Removed. Hopeless out-dated. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/AnnotationType.java: christian@4183: New. Hibernate model to access the type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Register the new backend type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Annotation.java: christian@4183: References the annotation type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportAnnotationType.java: christian@4183: New. Model to help import the annotation type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: christian@4183: Uses the import type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: christian@4183: Set the annotation type to 'null'. TODO: Do the classification! christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Fix for flys/issue110. start index was shifted by one. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportAnnotation.java: christian@4183: Forgot to store reference to edge. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Register backend model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportEdge.java: New. Model christian@4183: for importing the edges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: christian@4183: Parses the edges of an annotation, too. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added table edges to model 'Kanten' of an annotation. christian@4183: To update existing databases: christian@4183: BEGIN; christian@4183: CREATE SEQUENCE EDGES_ID_SEQ; christian@4183: CREATE TABLE edges ( christian@4183: id int PRIMARY KEY NOT NULL, christian@4183: top NUMERIC, christian@4183: bottom NUMERIC); christian@4183: ALTER TABLE annotations ADD COLUMN edge_id int REFERENCES edges(id); christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Edge.java: New. A 'Kanten'-Model. christian@4183: * src/main/java/de/intevation/flys/model/Annotation.java: References the christian@4183: edges. christian@4183: christian@4183: 2011-06-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added method to find gauge only by station position. christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Make search for gauges independent of from/to order. christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added a new view to select qs of a WST. christian@4183: To update existing databases: christian@4183: christian@4183: CREATE VIEW wst_q_values AS christian@4183: SELECT wc.position AS column_pos, christian@4183: wqr.q AS q, christian@4183: r.a AS a, christian@4183: r.b AS b, christian@4183: wc.wst_id AS wst_id christian@4183: FROM wst_column_q_ranges wcqr christian@4183: JOIN wst_q_ranges wqr ON wcqr.wst_q_range_id = wqr.id christian@4183: JOIN ranges r ON wqr.range_id = r.id christian@4183: JOIN wst_columns wc ON wcqr.wst_column_id = wc.id christian@4183: ORDER BY wc.position, wcqr.wst_column_id, r.a; christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added a new view to select ws of a WST. christian@4183: To update existing databases: christian@4183: christian@4183: CREATE VIEW wst_w_values AS christian@4183: SELECT wcv."position" AS km, christian@4183: wcv.w AS w, christian@4183: wc."position" AS column_pos, christian@4183: w.id AS wst_id christian@4183: FROM wst_column_values wcv christian@4183: JOIN wst_columns wc ON wcv.wst_column_id = wc.id christian@4183: JOIN wsts w ON wc.wst_id = w.id christian@4183: ORDER BY wcv."position", wc."position"; christian@4183: christian@4183: 2011-05-23 Sascha L. Teichmann christian@4183: christian@4183: flys/issue76 christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Close gaps between q ranges. christian@4183: christian@4183: 2011-05-20 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.3.1 christian@4183: christian@4183: 2011-05-13 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.3 christian@4183: christian@4183: 2011-05-13 Ingo Weinzierl christian@4183: christian@4183: * Changes: Changes for release 2.3 - see Changes file to get to know about christian@4183: the version numbers of this software. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added a column which tells christian@4183: if a river counts its km up or downwards. christian@4183: To update existing databases: christian@4183: christian@4183: ALTER TABLE rivers ADD COLUMN km_up BOOLEAN NOT NULL DEFAULT true; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Adjust Hibernate mapping of new column. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Fixed flys/issue11 and flys51. christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ValueKey.java: christian@4183: Add some unsharp comparison (eps = 1e-6) to avoid christian@4183: numerical problems. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/IdValueKey.java: christian@4183: Removed. Not need any longer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Use unsharp lookup. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Flush more often. Hopefully this reduces hibernate sync christian@4183: problems?! christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Fixed silly bug. Set flush mode back to auto because christian@4183: manual flushing causes some undetermined problems. christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Do not load _all_ values from discharge tables and christian@4183: wst columns. This is extremly slow and will lead christian@4183: to OOM if more rivers are imported. Now only the christian@4183: last 20 columns und discharge tables are cached. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ValueKey.java: christian@4183: New. Key for caching discharge table values and wst christian@4183: column values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/IdValueKey.java: christian@4183: Fixed bug in equals(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Removed too eloquent debug output. christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/IdValueKey.java: christian@4183: Use BigDecimals as representation for the numeric components christian@4183: which prevents running into unique constraint problems christian@4183: caused by imprecision. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Ranges are now cached globally, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Improved logging. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-05-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/StaFileParser.java: christian@4183: Only accept main value types 'Q', 'W', 'D' and 'T' by default. christian@4183: '-' is not handled any more because it causes too much constraint christian@4183: problems. You can overwrite the imported type with the christian@4183: system property flys.backend.main.value.types" (default "QWTD") christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Set session flush mode to manual. Hopefully this improves the christian@4183: performance a bit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportGauge.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: Improved logging. christian@4183: christian@4183: 2011-05-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: Deleted christian@4183: * src/main/java/de/intevation/flys/importer/IdValueKey.java: Reinserted christian@4183: here in a more generalized form. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: Cache the discharge table value, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java: christian@4183: Use the global cache. christian@4183: christian@4183: 2011-05-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImporterSession.java: christian@4183: New. Centralized caching in the thread local context. Importing christian@4183: the Elbe leads to OOM because the column values of the christian@4183: WST files where loaded separately for every file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportPosition.java, christian@4183: src/main/java/de/intevation/flys/importer/Importer.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportMainValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportMainValueType.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportGauge.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAttribute.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: christian@4183: Adjusted to use the new global context. christian@4183: christian@4183: 2011-05-08 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Dropped constraint which christian@4183: forces discharge tables to have a unique time interval christian@4183: for a given gauge and kind. christian@4183: christian@4183: There are AT files (historical Mosel/Perl/Perl/1967-1981.at christian@4183: and Mosel/Perl/1967-1981-1.at) which violate this christian@4183: constraint. Its a technical question to the customer christian@4183: how to handle these cases. christian@4183: christian@4183: To adjust existing databases: christian@4183: christian@4183: ALTER TABLE discharge_tables DROP CONSTRAINT discharge_tables_gauge_id_key; christian@4183: christian@4183: 2011-05-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: There are wst files where column names are not unique. christian@4183: Make them unique by appending (1), (2) and so on. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Import the "HW-Schutzanlagen", too. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: Make import of historical discharge tables work. christian@4183: christian@4183: * doc/schema/postgresql.sql: Added forgotten column 'description'. christian@4183: christian@4183: !!! You have to drop your database !!! christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: src/main/java/de/intevation/flys/model/DischargeTable.java: christian@4183: Add the forgotten description property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Fixed problems with date recognition. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Prefix the description of the historical discharge tables christian@4183: with "Histor.Abflusstafeln". christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: christian@4183: Fixed silly programming error. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Inject 'kind' attribute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Traverse the "Histor.Abflusstafeln" for the historical christian@4183: discharge tables. too. TODO: Store them in the database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: Added convinience constructor to set the kind of the christian@4183: discharge table. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Prefix "Zusätzliche Längsschnitte" with "Zus.Längsschnitte" christian@4183: in description. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Import 'Hochwasser-Marken', too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-05-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Ignore lines that contain km positions which were found christian@4183: before in the same file. christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Added a method that christian@4183: returns all gauges of the river intersected by a given start and end christian@4183: point. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: christian@4183: Forgot to fetch peer from result set. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportTimeInterval.java: christian@4183: New. Importer model help fetching the database peer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/TimeInterval.java: christian@4183: Add convinience constructor with start and stop time. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Attach a time interval to a discharge table if we find one. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: Store the reference to the importer model of the christian@4183: time interval of the discharge table. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: christian@4183: Try to extract time ranges from at files. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse and store "amtliche Linien" wst files. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse and store fixation wst files as well. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse the "zusaetzliche Laengsschnitte", too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java: christian@4183: Add getter/setter for column 'kind'. christian@4183: christian@4183: 2011-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Fixed flys/issue19: Do not take km column in wst file as a water level. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: Introduced a 'scale' christian@4183: that is used to adjust the range of min/max W values. christian@4183: christian@4183: 2011-05-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-04-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstColumnValueKey.java: christian@4183: New. This class is used as distinct key of a WstColumnValue - e.g. as christian@4183: key in a map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java: A christian@4183: WstColumnValue cache is build up while initialization. This cache christian@4183: contains all WstColumnValues that exist in the database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: New christian@4183: constructor that takes the WstColumnValues cache. It is used to christian@4183: initialize new ImportWstColumnValue objects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: christian@4183: Speedup: A ImportWstColumnValue has a WstColumnValues cache that christian@4183: contains all WstColumnValues existing in the database. This makes it christian@4183: unnecessary to call an sql statement for each WstColumnValue to christian@4183: determine its existence in the database. christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: christian@4183: Added a view 'wst_value_table' which aggregates the data christian@4183: to build w/q value tables. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: BEGIN; christian@4183: CREATE VIEW wst_value_table AS christian@4183: SELECT wcv.position AS position, christian@4183: w, christian@4183: (SELECT q christian@4183: FROM wst_column_q_ranges wcqr christian@4183: JOIN wst_q_ranges wqr christian@4183: ON wcqr.wst_q_range_id = wqr.id christian@4183: JOIN ranges r christian@4183: ON r.id = wqr.range_id christian@4183: WHERE wcqr.wst_column_id = wc.id christian@4183: AND wcv.position BETWEEN r.a AND r.b) AS q, christian@4183: wc.position AS column_pos, christian@4183: w.id AS wst_id christian@4183: FROM wst_column_values wcv christian@4183: JOIN wst_columns wc christian@4183: ON wcv.wst_column_id = wc.id christian@4183: JOIN wsts w christian@4183: ON wc.wst_id = w.id christian@4183: ORDER BY wcv.position ASC, christian@4183: wc.position DESC; christian@4183: COMMIT; christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: christian@4183: Add forgotten one to many relation Wst -> WstColumn. christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Import of q ranges of wst files was totally broken. :-/ christian@4183: You have to reimport all your data. christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: Forgot kind parameter in peer fetching query. christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java:: christian@4183: Added a new method to determine the gauge based on a given start and end christian@4183: point of the river. christian@4183: christian@4183: 2011-04-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added 'position' column to wst_columns christian@4183: to allow order them by there column position in the original christian@4183: wst file. christian@4183: christian@4183: Update existing database with: christian@4183: christian@4183: BEGIN; christian@4183: ALTER TABLE wst_columns ADD COLUMN position int; christian@4183: UPDATE wst_columns w SET christian@4183: position = id - (SELECT min(id) FROM wst_columns WHERE wst_id = w.wst_id); christian@4183: ALTER TABLE wst_columns ADD CONSTRAINT wst_columns_wst_id_position_key christian@4183: UNIQUE (wst_id, position); christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java, christian@4183: src/main/java/de/intevation/flys/model/WstColumn.java: christian@4183: Adjusted models. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Adjusted importer. christian@4183: christian@4183: 2011-04-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Forget ',' in schema. christian@4183: christian@4183: 2011-04-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java (determineMinMaxQ): christian@4183: Fixed index problem when an empty list is returned. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Wst.java: A Wst is now able to christian@4183: return its min and max Q values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: A Gauge is now able christian@4183: to return its min and max W values. christian@4183: christian@4183: 2011-04-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Added new column 'kind' in christian@4183: discharge tables and wst to distinguish between different christian@4183: kinds like 'Haupt-WST', 'zusaetzliche Laengsschnitte', christian@4183: 'amtliche Daten' and so on. christian@4183: christian@4183: Update existing databases with: christian@4183: BEGIN; christian@4183: ALTER TABLE discharge_tables ADD COLUMN kind int NOT NULL DEFAULT 0; christian@4183: ALTER TABLE wsts ADD COLUMN kind int NOT NULL DEFAULT 0; christian@4183: COMMIT; christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DischargeTable.java christian@4183: src/main/java/de/intevation/flys/model/Wst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: christian@4183: Adjusted the models. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionHolder.java: Moved to christian@4183: this module from flys-artifacts. This is necessary to get access to the christian@4183: current session in this module as well. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Added a method that christian@4183: returns the min and max distance of a river. christian@4183: christian@4183: 2011-04-03 Sascha L. Teichmann christian@4183: christian@4183: * src/**/*.java: Removed trailing whitespace. christian@4183: christian@4183: 2011-03-30 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 0.1 christian@4183: christian@4183: 2011-03-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Range.java: christian@4183: Forgot to save the last change before commit. christian@4183: christian@4183: 2011-03-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Range.java: christian@4183: Added methods to find out if two ranges intersects. christian@4183: christian@4183: 2011-03-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Added an one to many relation to the discharge tables of a gauge. christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: Finished import of WSTs. christian@4183: christian@4183: TODO 1: Speed it up! It takes on a high end machine over 7(!) christian@4183: minutes only for the data of the Saar. christian@4183: TODO 2: Double precision floating point representations produced christian@4183: by the the parsers leed to unique constraint violations christian@4183: in the backend on a second run. So the import is currently christian@4183: only working on freshly initialized data bases. christian@4183: More consequent working with BigDecimal and some christian@4183: rounding may be of help here. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WstColumnValue.java: christian@4183: Added convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java: christian@4183: Added getPeer() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Add a list of the ImportWstColumnValues produced by the WST parser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: Add christian@4183: the (km, w) values to the ImportWstColumns. christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Build models for wsts, wst columns and q ranges and christian@4183: store them in the backend. TODO: store the w values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/WstQRange.java christian@4183: src/main/java/de/intevation/flys/model/Wst.java, christian@4183: src/main/java/de/intevation/flys/model/Range.java, christian@4183: src/main/java/de/intevation/flys/model/WstColumnQRange.java, christian@4183: src/main/java/de/intevation/flys/model/WstColumn.java: christian@4183: Added convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumn.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java: christian@4183: Added getPeer() methods. christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: The unit extraction in the WST parser of desktop FLYS christian@4183: is broken! Add a hack here to repair this for our christian@4183: importer. Desktop FLYS needs a fix, too! christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java: christian@4183: Ported some stuff ver from WSTSource.java of desktop flys to christian@4183: parse WST files. TODO: create instances of the import models. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/StringUtil.java: christian@4183: Copied from desktop flys. Used for some string operations christian@4183: in WST parser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Added system property 'flys.backend.importer.dry.run'. christian@4183: Set to true only the parsing is done and no writing christian@4183: to the backend. Default: false. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java, christian@4183: src/main/java/de/intevation/flys/model/MainValueType.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2011-03-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/DischargeTableValue.java, christian@4183: src/main/java/de/intevation/flys/model/DischargeTable.java: Added new christian@4183: constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AtFileParser.java: New. This christian@4183: parser is used to '*.at' files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: Added code to christian@4183: import discharge tables. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportDischargeTableValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportDischargeTable.java: New. christian@4183: Helper models for import discharge tables. christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/WstParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Added stub for WST parser. christian@4183: christian@4183: 2011-03-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportWstQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWst.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumnValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumnQRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportWstColumn.java: christian@4183: Added importer helper model stubs for WST imports. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: Second part of parsing/storing main values. Should be finished now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportNamedMainValue.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportMainValue.java: christian@4183: New. Helper models for import main values, christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MainValue.java, christian@4183: src/main/java/de/intevation/flys/model/NamedMainValue.java: christian@4183: Added convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Write main values to backend, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/StaFileParser.java: christian@4183: Build importer models for main values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: christian@4183: Data was called 'value'. Now it is 'name' to fit the christian@4183: schema. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Fixed wrong unique constraint. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Added some logging when storing gauges. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Add forgotten column river_id. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Small HQL fix. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Gauge.java: christian@4183: Added convinience contructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Fixed getPeer() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/StaFileParser.java: christian@4183: Fixed parsing of STA files. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Propagate river into storing of gauges. christian@4183: christian@4183: 2011-03-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Added code to store rivers not only annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Added stub code to write gauges. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: First part of parsing main values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Commented out christian@4183: creation of dummy rivers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/NamedMainValues.java: christian@4183: Moved to NamedMainValue. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/NamedMainValue.java: christian@4183: New. Formerly NamedMainValues. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MainValue.java: christian@4183: New. Forgotten part of the model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/MainValueType.java: christian@4183: Data is String not BigDecimal christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Range.java: Removed christian@4183: contructor with double arguments. Using BigDecimal now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PegelGltParser.java: christian@4183: Propagate BigDecimal usage. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Removed needless import. Added TODO christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Parse the dependencies of the gauges, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/StaFileParser.java: christian@4183: New. Parser for STA files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Call STA file parser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java: christian@4183: Uses BigDecimal now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportAttribute.java: christian@4183: Fixed wrong type cast in equals. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportMainValueType.java: christian@4183: New. Helper model for importing main value types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Register forgotten MainValue model. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: Store annotations in backend. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Annotation.java: christian@4183: New convinience constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added toString() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Range.java: christian@4183: Fixed nasty mistake in @OneToOne annotatation. christian@4183: New convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportPosition.java christian@4183: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java christian@4183: src/main/java/de/intevation/flys/importer/ImportAttribute.java: christian@4183: Make storing to backend work. It's a bit too slow. :-/ christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Fetch peer from backend. Added method to store annotations. christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Stored annotations into backend. More eloquent SQL exception christian@4183: handling. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/Attribute.java, christian@4183: src/main/java/de/intevation/flys/model/Position.java: christian@4183: Added convinience constructors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportPosition.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAttribute.java: christian@4183: Bound them to there backend peers. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/AnnotationsParser.java: christian@4183: New. Added parser to read *.KM files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportPosition.java, christian@4183: src/main/java/de/intevation/flys/importer/PegelGltParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRiver.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAnnotation.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java, christian@4183: src/main/java/de/intevation/flys/importer/InfoGewParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAttribute.java: christian@4183: Adjusted to load the annotations from *.KM files. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportPosition.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportRange.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAttribute.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportAnnotation.java: christian@4183: New helper models for import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PegelGltParser.java, christian@4183: src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: Use new models. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PegelGltParser.java: christian@4183: New. Parser for PEGEL.GLT files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportGauge.java: christian@4183: New. Import model for gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: christian@4183: Removed needless imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Added method to parse the gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: christian@4183: Trigger pegel glt file parsing. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Used thread local pattern to make sharing of session easier. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Fixed error in HQL statement. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: christian@4183: Commented out a debug block because it leaks the db password. christian@4183: christian@4183: 2011-03-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: christian@4183: Expose imported rivers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: christian@4183: Store imported rivers into database. Needs testing! christian@4183: christian@4183: 2011-03-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Default connection parameters are now overwritable with christian@4183: system properties (defaults in brackets): christian@4183: - user name: flys.backend.user (flys) christian@4183: - user password: flys.backend.password (flys) christian@4183: - db dialect: flys.backend.dialect (org.hibernate.dialect.PostgreSQLDialect) christian@4183: - db driver: flys.backend.driver (org.postgresql.Driver) christian@4183: - db url: flys.backend.url (jdbc:postgresql://localhost:5432/flys) christian@4183: christian@4183: 2011-03-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: Expose createSessionFactory() as public to be usable without christian@4183: a artifact database running. christian@4183: christian@4183: 2011-03-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FileTools.java: christian@4183: Tools for handling with filenames. Currently there is christian@4183: a repair(File) method with repairs letter case errors christian@4183: which is useful when reading windows filenames on a christian@4183: un*x platform. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/Importer.java: christian@4183: Standalone app to read data from the file system and christian@4183: store it in a database. Currently it does not store christian@4183: anything. It only loads info gew files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/InfoGewParser.java: christian@4183: Info gew parser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/ImportRiver.java: christian@4183: Helper model of a river used produced by parsing the christian@4183: info gew files. christian@4183: christian@4183: 2011-03-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: christian@4183: New. SessionFactoryProvider.getSessionFactory() provides a christian@4183: SessionFactory to use the Hibernate O/R mapper for the FLYS backend. christian@4183: christian@4183: 2011-03-15 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added dependency to artifacts-commons to christian@4183: be able to use the global configuration of the artifact database. christian@4183: christian@4183: 2011-03-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Wire all POJOs christian@4183: to corresponding factory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/*.java: Generate christian@4183: all foreign key constraints. TODO: name them correctly christian@4183: because the machine generated names are ugly and do christian@4183: not fit the PostgreSQL names. christian@4183: christian@4183: * doc/schema/postgresql.sql: Small quantifier fix in descriptions christian@4183: of wst columns. christian@4183: christian@4183: 2011-03-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql: Fixed wrong spelled christian@4183: column references in foreign keys introduces with christian@4183: last change. christian@4183: christian@4183: 2011-03-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/*.java: Added christian@4183: column annotations for simple fields. TODO: foreign keys. christian@4183: christian@4183: 2011-03-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: christian@4183: Fixed inconsistent table names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/*.java: Added christian@4183: entity and id annotations. christian@4183: christian@4183: 2011-03-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql.sql, doc/schema/postgresql-cleanup.sql: christian@4183: Added missing sequences. christian@4183: christian@4183: * doc/schema/sqlite.sql: Deleted. Not longer supported. christian@4183: christian@4183: 2011-03-11 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql-cleanup.sql: Forgot to add. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Use christian@4183: Apache Commons DBCP as Hibernate connection provide. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: christian@4183: Added a constructor with string argument. Set the christian@4183: sequence increment to 1 (eat up 100 at a time before). christian@4183: christian@4183: * pom.xml: Added PostgreSQL 8.4 driver as runtime dependency. christian@4183: christian@4183: 2011-03-11 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/postgresql-cleanup.sql: New. Tear down schema christian@4183: for a postgres database. christian@4183: christian@4183: * doc/schema/postgresql.sql: Added squence for christian@4183: auto generating ids in river table. Cleaned up schema. christian@4183: christian@4183: * src/main/java/de/intevation/flys/App.java: Simple christian@4183: test app to interact with hibernate. Needs to be removed christian@4183: because its only a toy. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java: christian@4183: New. Binds Apache Commons to Hibernate. christian@4183: christian@4183: * pom.xml: Added dependencies to log4j, commons dbcp, christian@4183: JPA of hibernate. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/River.java: Added christian@4183: JPA annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/*.java: Replaced christian@4183: Long with Integer because column ids are only four bytes wide. christian@4183: christian@4183: 2011-03-11 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/sqlite.sql, doc/schema/postgresql.sql: Fixed christian@4183: smaller issues in ddl. christian@4183: christian@4183: * src/main/java/de/intevation/flys/model/*.java: Added POJOs christian@4183: of to be mapped. TODO: Map them! christian@4183: christian@4183: * pom.xml: Added plugin config for hibernate. christian@4183: christian@4183: 2011-03-09 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added dependency (and corresponding repository) to christian@4183: Hibernate Core 3.6.1 Final christian@4183: christian@4183: 2011-03-09 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml, src/**: Created a new empty maven project: christian@4183: $ mvn archetype:create \ christian@4183: -DgroupId=de.intevation.flys \ christian@4183: -DartifactId=flys-backend christian@4183: christian@4183: 2011-03-09 Sascha L. Teichmann christian@4183: christian@4183: * README: New. Some setup instructions. christian@4183: christian@4183: * doc/schema/postgresql.sql: New. Schema converted to PostgreSQL christian@4183: christian@4183: * doc/schema/sqlite.sql: Fixed defect foreign key constraints. christian@4183: christian@4183: 2011-03-09 Sascha L. Teichmann christian@4183: christian@4183: * doc/schema/sqlite.sql: Factorized time intervals out into christian@4183: a separated table. christian@4183: christian@4183: 2011-01-22 Sascha L. Teichmann christian@4183: christian@4183: * contrib/import-kms.py, contrib/import-gew.py: Initial scripts christian@4183: to import data into SQLite database. They still need some work. christian@4183: christian@4183: 2011-02-10 Sascha L. Teichmann : christian@4183: christian@4183: * doc/schema/sqlite.sql: Added initial schema for christian@4183: FLYS database.