# HG changeset patch # User gernotbelger # Date 1539790848 -7200 # Node ID 6dd539efebb19892d8543006885e7e1fddb9b145 # Parent 3264c2df4f185566b5b19aa4b430f63d3db22fc2 WMS config little changes diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/doc/conf/modules/wms_uedauern_mittel_Beispielfluss.tsv --- a/artifacts/doc/conf/modules/wms_uedauern_mittel_Beispielfluss.tsv Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/doc/conf/modules/wms_uedauern_mittel_Beispielfluss.tsv Wed Oct 17 17:40:48 2018 +0200 @@ -7,8 +7,8 @@ # Änderungen werden erst nach einem Neustart des Servers wirksam. -Langjähriges Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Mittel (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriger Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjährige Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Mittelwert (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/doc/conf/modules/wms_uedauern_mittel_Elbe.tsv --- a/artifacts/doc/conf/modules/wms_uedauern_mittel_Elbe.tsv Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/doc/conf/modules/wms_uedauern_mittel_Elbe.tsv Wed Oct 17 17:40:48 2018 +0200 @@ -7,8 +7,8 @@ # Änderungen werden erst nach einem Neustart des Servers wirksam. -Langjähriges Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Mittel (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriger Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer -Langjährige Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer \ No newline at end of file +Mittelwert (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer +Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Elbe_Statistik_1990_2016/MapServer/WMSServer \ No newline at end of file diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/doc/conf/modules/wms_uedauern_mittel_Rhein.tsv --- a/artifacts/doc/conf/modules/wms_uedauern_mittel_Rhein.tsv Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/doc/conf/modules/wms_uedauern_mittel_Rhein.tsv Wed Oct 17 17:40:48 2018 +0200 @@ -7,8 +7,8 @@ # Änderungen werden erst nach einem Neustart des Servers wirksam. -Langjähriges Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Mittel (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer -Langjähriger Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer -Langjähriges Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer -Langjährige Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer \ No newline at end of file +Mittelwert (1990-2016) 1 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer +Median (1990-2016) 2 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer +Minimum (1990-2016) 3 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer +Maximum (1990-2016) 0 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer +Standardabweichung (1990-2016) 4 https://geoportal.bafg.de/arcgis3/services/Flut3/Rhein_Statistik_1990_2016/MapServer/WMSServer \ No newline at end of file diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/AbstractYearEpochUrlState.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/AbstractYearEpochUrlState.java Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/AbstractYearEpochUrlState.java Wed Oct 17 17:40:48 2018 +0200 @@ -50,7 +50,7 @@ final UedauernConfiguration properties = UedauernConfiguration.getInstance(access.getRiverName(), this.type); final Collection items = properties.getLabels(); - final String columnType = "STRING"; + final String columnType = "TEXT"; final AddTableDataHelper helper = new AddTableDataHelper(creator, select, "select_key", context.getMeta()); // pinKeycolum; nicht zu helper.addColumn(0, "pinfrom", "60", "common.client.ui.selection", "ICON", "CENTER", "from"); diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java Wed Oct 17 17:40:48 2018 +0200 @@ -112,8 +112,8 @@ year = bedheights.get(0).getYear(); // das jahr/epoche ist immer dasselbe helper.addColumn(0, "year", "60", "year", "INTEGER", "LEFT", null); - helper.addColumn(1, "range", "130", "state.uinfo.salix.historical.km_range_part", "STRING", "LEFT", null); - helper.addColumn(2, "description", "500", "uinfo.salix.sounding", "STRING", "LEFT", null); + helper.addColumn(1, "range", "130", "state.uinfo.salix.historical.km_range_part", "TEXT", "LEFT", null); + helper.addColumn(2, "description", "500", "uinfo.salix.sounding", "TEXT", "LEFT", null); final TreeMap bedHeightSorted = new TreeMap<>(); final java.text.NumberFormat formatter = Formatter.getCalculationKm(context.getMeta()); diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Wed Oct 17 17:40:48 2018 +0200 @@ -51,7 +51,7 @@ } catch ( - final IllegalArgumentException iae) { + final IllegalArgumentException iae) { iae.printStackTrace(); } } @@ -63,7 +63,7 @@ helper.addColumn(0, "pinfrom", "40", "common.client.ui.from", "ICON", "CENTER", "from"); helper.addColumn(1, "year", "60", "year", "INTEGER", "LEFT", null); - helper.addColumn(2, "sounding", "500", "uinfo.salix.soundings", "STRING", "LEFT", null); + helper.addColumn(2, "sounding", "500", "uinfo.salix.soundings", "TEXT", "LEFT", null); final TreeMap bedHeightSorted = new TreeMap<>(); diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Wed Oct 17 17:40:48 2018 +0200 @@ -90,8 +90,7 @@ state.uinfo.inundation.load.epoch= Epoch state.uinfo.load.epoch=Epoch state.uinfo.year=Year -state.uinfo.epoch=Epoch -state.uinfo.totalepoch= Longtime Mean ({0} - {1}) +state.uinfo.epoch=Longtime Flooding Durations uinfo_select_delta_w_column = \u0394W [cm] state.sinfo.year_epoch = Year/Epoch diff -r 3264c2df4f18 -r 6dd539efebb1 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Wed Oct 17 17:10:52 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Wed Oct 17 17:40:48 2018 +0200 @@ -90,8 +90,7 @@ state.uinfo.inundation.load.epoch= Epoche state.uinfo.load.epoch=Epoche state.uinfo.year=Einzeljahr -state.uinfo.epoch=Epoche -state.uinfo.totalepoch=Langj\u00e4hriges Mittel ({0} - {1}) +state.uinfo.epoch=Langj\u00e4hrige \u00dcberflutungsdauern uinfo_select_delta_w_column = \u0394W [cm] state.sinfo.year_epoch = Jahr/Epoche