# HG changeset patch # User gernotbelger # Date 1533809010 -7200 # Node ID 63c086139391c10078efcc8cf754dc77a909ccad # Parent 0a1d8c1817b5f4e8212aefd589ad031ff3df8454 Salix-Linie -> Iota diff -r 0a1d8c1817b5 -r 63c086139391 artifacts/doc/conf/artifacts/uinfo.xml --- a/artifacts/doc/conf/artifacts/uinfo.xml Thu Aug 09 09:52:04 2018 +0200 +++ b/artifacts/doc/conf/artifacts/uinfo.xml Thu Aug 09 12:03:30 2018 +0200 @@ -267,7 +267,7 @@ - + diff -r 0a1d8c1817b5 -r 63c086139391 artifacts/doc/conf/generators/longitudinal-diagrams.xml --- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml Thu Aug 09 09:52:04 2018 +0200 +++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml Thu Aug 09 12:03:30 2018 +0200 @@ -194,7 +194,7 @@ names="uinfo_salix_line,uinfo_salix_line_chartinfo" class="org.dive4elements.river.exports.LongitudinalSectionGenerator2" converter="org.dive4elements.river.exports.DiagramAttributes"> - + <title key="uinfo.chart.salix_line.section.title" default="Iota (DEFAULT)"/> &longitudinal-defaults; <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/> <subtitle key="chart.w_differences.subtitle" default="-"> diff -r 0a1d8c1817b5 -r 63c086139391 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Thu Aug 09 09:52:04 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Thu Aug 09 12:03:30 2018 +0200 @@ -1124,7 +1124,7 @@ help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch -uinfo_salix_line = Salix-Linie +uinfo_salix_line = Iota (Fluss/Aue-Konnektivit\u00e4t) uinfo_inundation_duration = \u00dcberflutungsdauern Aue uinfo_vegetation_zones = Vegetationszonen @@ -1140,8 +1140,8 @@ uinfo.salix.sounding= Peilung uinfo.salix.soundings= Soundings uinfo.export.salix_line.csv.header.scenario_deltaw = \u0394MW [cm] -uinfo.export.salix_line.csv.header.scenario = Salix-Linie_Szenario [m] -uinfo.export.salix_line.csv.header.salix_line = Salix-Linie [m] +uinfo.export.salix_line.csv.header.scenario = Iota_Szenario [m] +uinfo.export.salix_line.csv.header.salix_line = Iota [m] uinfo.export.salix_line.csv.header.mw_mnw = (MW-MNW)x(-1) [m] uinfo.export.csv.meta.header.salix.regional = ##Regional wirkende Eingriffe uinfo.export.csv.meta.header.salix.supraregional = ##\u00dcberregional wirkende Eingriffe @@ -1158,17 +1158,17 @@ uinfo.export.url.inundationduration.vegetation = Vegetationszonen ({0}) uinfo.export.url.inundationduration.vegetation_scenario= Vegetationszonen Szenario ({0}, {1}cm) uinfo.export.url.inundationduration.scenario = \u00dcberflutungsdauer Szenario ({0}, {1}cm) -uinfo.chart.salix_line.section.title = Salix-Linie (Fluss/Aue-Konnektivit\u00e4t) - L\u00e4ngsschnitt +uinfo.chart.salix_line.section.title = Iota (Fluss/Aue-Konnektivit\u00e4t) - L\u00e4ngsschnitt uinfo.chart.salix_line.section.yaxis.label = [m] -uinfo_facet_salix_line = Salix-Linie -uinfo_facet_salix_line.filtered.description = Salix-Linie -uinfo_facet_salix_line.raw.description = Salix-Linie (Rohdaten) +uinfo_facet_salix_line = Iota +uinfo_facet_salix_line.filtered.description = Iota +uinfo_facet_salix_line.raw.description = Iota (Rohdaten) uinfo_facet_salix_mnwmw = (MW-MNW)x(-1) uinfo_facet_salix_mnwmw.filtered.description = (MW-MNW)x(-1) uinfo_facet_salix_mnwmw.raw.description = (MW-MNW)x(-1) (Rohdaten) -uinfo_facet_salix_scenario = Salix-Linie Szenario, {0} -uinfo_facet_salix_scenario.filtered.description = Salix-Linie Szenario, {0} -uinfo_facet_salix_scenario.raw.description = Salix-Linie Szenario, {0} (Rohdaten) +uinfo_facet_salix_scenario = Iota Szenario, {0} +uinfo_facet_salix_scenario.filtered.description = Iota Szenario, {0} +uinfo_facet_salix_scenario.raw.description = Iota Szenario, {0} (Rohdaten) uinfo_salix_scenario_deltaw = \u0394MW={0} uinfo_salix_scenario_supraregional = \u00fcberregional uinfo_salix_scenario_historical = historisch diff -r 0a1d8c1817b5 -r 63c086139391 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Thu Aug 09 09:52:04 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Thu Aug 09 12:03:30 2018 +0200 @@ -1123,7 +1123,7 @@ help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch -uinfo_salix_line = Salix-Linie +uinfo_salix_line = Iota (Fluss/Aue-Konnektivit\u00e4t) uinfo_inundation_duration = \u00dcberflutungsdauern Aue uinfo_vegetation_zones = Vegetationszonen @@ -1139,8 +1139,8 @@ uinfo.salix.sounding= Peilung uinfo.salix.soundings= Peilungen uinfo.export.salix_line.csv.header.scenario_deltaw = \u0394MW [cm] -uinfo.export.salix_line.csv.header.scenario = Salix-Linie_Szenario [m] -uinfo.export.salix_line.csv.header.salix_line = Salix-Linie [m] +uinfo.export.salix_line.csv.header.scenario = Iota_Szenario [m] +uinfo.export.salix_line.csv.header.salix_line = Iota [m] uinfo.export.salix_line.csv.header.mw_mnw = (MW-MNW)x(-1) [m] uinfo.export.csv.meta.header.salix.regional = ##Regional wirkende Eingriffe uinfo.export.csv.meta.header.salix.supraregional = ##\u00dcberregional wirkende Eingriffe @@ -1157,24 +1157,24 @@ uinfo.export.url.inundationduration.vegetation = Vegetationszonen ({0}) uinfo.export.url.inundationduration.vegetation_scenario= Vegetationszonen Szenario ({0}, {1}cm) uinfo.export.url.inundationduration.scenario = \u00dcberflutungsdauer Szenario ({0}, {1}cm) -uinfo.chart.salix_line.section.title = Salix-Linie (Fluss/Aue-Konnektivit\u00e4t) - L\u00e4ngsschnitt +uinfo.chart.salix_line.section.title = Iota (Fluss/Aue-Konnektivit\u00e4t) - L\u00e4ngsschnitt uinfo.chart.salix_line.section.yaxis.label=[m] -uinfo_facet_salix_line = Salix-Linie -uinfo_facet_salix_line.filtered.description = Salix-Linie -uinfo_facet_salix_line.raw.description = Salix-Linie (Rohdaten) +uinfo_facet_salix_line = Iota +uinfo_facet_salix_line.filtered.description = Iota +uinfo_facet_salix_line.raw.description = Iota (Rohdaten) uinfo_facet_salix_mnwmw = (MW-MNW)x(-1) uinfo_facet_salix_mnwmw.filtered.description = (MW-MNW)x(-1) uinfo_facet_salix_mnwmw.raw.description = (MW-MNW)x(-1) (Rohdaten) -uinfo_facet_salix_scenario = Salix-Linie Szenario, {0} -uinfo_facet_salix_scenario.filtered.description = Salix-Linie Szenario, {0} -uinfo_facet_salix_scenario.raw.description = Salix-Linie Szenario, {0} (Rohdaten) +uinfo_facet_salix_scenario = Iota Szenario, {0} +uinfo_facet_salix_scenario.filtered.description = Iota Szenario, {0} +uinfo_facet_salix_scenario.raw.description = Iota Szenario, {0} (Rohdaten) uinfo_salix_scenario_deltaw = \u0394MW={0} uinfo_salix_scenario_supraregional = \u00fcberregional uinfo_salix_scenario_historical = historisch uinfo_facet_salix_rank = Bewertungsschema uinfo_facet_salix_rank.description = Bewertungsschema uinfo_salix_calc.warning.missing_mq = MQ (MW) fehlt am Bezugspegel, Berechnung nicht m\u00f6glich -uinfo_salix_calc.warning.missing_mhq = MHQ (MHW) fehlt am Bezugspegel, Berechnung der Salix-Linie nicht m\u00f6glich +uinfo_salix_calc.warning.missing_mhq = MHQ (MHW) fehlt am Bezugspegel, Berechnung des Iota nicht m\u00f6glich uinfo_salix_calc.warning.missing_mnq = MNQ (MNW) fehlt am Bezugspegel, Berechnung von (MW-MNW) nicht m\u00f6glich predefineddepthevol.total.title = Gesamt: {0} diff -r 0a1d8c1817b5 -r 63c086139391 backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java --- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java Thu Aug 09 09:52:04 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/UInfoImporter.java Thu Aug 09 12:03:30 2018 +0200 @@ -29,8 +29,7 @@ * @author Matthias Schäfer * */ -public class UInfoImporter -{ +public class UInfoImporter { /***** FIELDS *****/ private static final Logger log = Logger.getLogger(UInfoImporter.class); @@ -39,7 +38,7 @@ private enum UInfoDirName { BASICS("Basisdaten"), // - SALIX("Salix-Linie" + File.separator + "Salix-Linie"), // + SALIX("Iota" + File.separator + "Iota"), // VEGETATION("Vegetationszonen"); private final String dirname; @@ -51,6 +50,7 @@ public String getDir() { return this.dirname; } + public File getFile() { return new File(getDir()); } @@ -70,7 +70,6 @@ */ private File rootDir; - /***** CONSTRUCTOR *****/ public UInfoImporter() { @@ -89,15 +88,13 @@ if (!SalixParser.shallSkip()) { if (!this.parsers.addAll(SalixParser.createParsers(UInfoDirName.SALIX.buildPath(this.rootDir), UInfoDirName.SALIX.getFile(), river))) log.info("Salix: no files found"); - } - else { + } else { log.info("Salix: skipped"); } if (!VegetationParser.shallSkip()) { if (!this.parsers.addAll(VegetationParser.createParsers(UInfoDirName.VEGETATION.buildPath(this.rootDir), UInfoDirName.VEGETATION.getFile(), river))) log.info("Vegetation: no files found"); - } - else { + } else { log.info("Vegetation: skipped"); } } diff -r 0a1d8c1817b5 -r 63c086139391 backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java --- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java Thu Aug 09 09:52:04 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java Thu Aug 09 12:03:30 2018 +0200 @@ -39,7 +39,7 @@ private static final Logger log = Logger.getLogger(SalixParser.class); - private static final String IMPORT_FILENAME = "Salix-Linie.csv"; + private static final String IMPORT_FILENAME = "Iota.csv"; private static final Pattern META_EVALUATOR = Pattern.compile("^#\\sAuswerter:\\s*([^;]*).*", Pattern.CASE_INSENSITIVE); @@ -60,14 +60,12 @@ private final EnumMap<ColTitlePattern, Integer> cols = new EnumMap<>(ColTitlePattern.class); - /***** CONSTRUCTORS *****/ public SalixParser(final File importPath, final File rootRelativePath, final ImportRiver river) { super(importPath, rootRelativePath, river); } - /***** METHODS *****/ @Override diff -r 0a1d8c1817b5 -r 63c086139391 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Aug 09 09:52:04 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Aug 09 12:03:30 2018 +0200 @@ -829,7 +829,7 @@ uinfo_salix_dmwspl_short = \u0394MW [cm] uinfo_inundation_duration_export = \u00dcberflutungsdauern Export uinfo_inundation_duration_set_vegetation_zone = Vegetationstabelle \u00fcbernehmen -uinfo_salix_line_export = Salix-Linie Export +uinfo_salix_line_export = Iota Export uinfo_vegetation_zones_export = Vegetationszonen Export defaultVegetationZone = Standardvegetationszone @@ -848,8 +848,8 @@ uinfo_salix_km_has_gaps = Der Km-Bereich ist nicht vollst. belegt. uinfo_salix_km_anschluss = Der eingegebene Bereich schlie\u00dft nicht an den letzten Wert an. uinfo_salix_input_complete = Die gesamte Strecke ist bereits mit Werten belegt. -uinfo_salix_lines = Salix-Linien -uinfo_salix_line = Salix-Linie - L\u00e4ngsschnitt +uinfo_salix_lines = Iotasn +uinfo_salix_line = Iota - L\u00e4ngsschnitt bundu = Betrieb und Unterhaltung bundu_bezugswst_fix_choice_title= Fixierungsauswahl diff -r 0a1d8c1817b5 -r 63c086139391 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Aug 09 09:52:04 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Aug 09 12:03:30 2018 +0200 @@ -829,7 +829,7 @@ uinfo_salix_dmwspl_short = \u0394MW [cm] uinfo_inundation_duration_export = \u00dcberflutungsdauern Export uinfo_inundation_duration_set_vegetation_zone = Vegetationstabelle \u00fcbernehmen -uinfo_salix_line_export = Salix-Linie Export +uinfo_salix_line_export = Iota Export uinfo_vegetation_zones_export = Vegetationszonen Export defaultVegetationZone = Standardvegetationszone @@ -848,8 +848,8 @@ uinfo_salix_km_has_gaps = Der Km-Bereich ist nicht vollst. belegt. uinfo_salix_km_anschluss = Der eingegebene Bereich schlie\u00dft nicht an den letzten Wert an. uinfo_salix_input_complete = Die gesamte Strecke ist bereits mit Werten belegt. -uinfo_salix_lines = Salix-Linien -uinfo_salix_line = Salix-Linie - L\u00e4ngsschnitt +uinfo_salix_lines = Iotasn +uinfo_salix_line = Iota - L\u00e4ngsschnitt bundu = Betrieb und Unterhaltung bundu_bezugswst_fix_choice_title= Fixierungsauswahl