Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java @ 2063:97a25b54eea3
Part 1 of #125: added a description for a location to the WaterlevelExport.
flys-artifacts/trunk@3557 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 02 Jan 2012 08:50:50 +0000 |
| parents | d13be39cfd1d |
| children | 2f5628f0de0e |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Thu Dec 29 14:21:52 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Mon Jan 02 08:50:50 2012 +0000 @@ -52,6 +52,15 @@ public static final String CSV_Q_HEADER = "export.waterlevel.csv.header.q"; + public static final String CSV_Q_DESC_HEADER = + "export.waterlevel.csv.header.q.desc"; + + public static final String CSV_LOCATION_HEADER = + "export.waterlevel.csv.header.location"; + + public static final String CSV_GAUGE_HEADER = + "export.waterlevel.csv.header.gauge"; + public static final String CSV_META_RESULT = "export.waterlevel.csv.meta.result"; @@ -80,9 +89,12 @@ public static final Pattern NUMBERS_PATTERN = Pattern.compile("\\D*(\\d++.\\d*)\\D*"); - public static final String DEFAULT_CSV_KM_HEADER = "Fluss-Km"; - public static final String DEFAULT_CSV_W_HEADER = "W [NN + m]"; - public static final String DEFAULT_CSV_Q_HEADER = "Q [m\u00b3/s]"; + public static final String DEFAULT_CSV_KM_HEADER = "Fluss-Km"; + public static final String DEFAULT_CSV_W_HEADER = "W [NN + m]"; + public static final String DEFAULT_CSV_Q_HEADER = "Q [m\u00b3/s]"; + public static final String DEFAULT_CSV_Q_DESC_HEADER = "Bezeichnung"; + public static final String DEFAULT_CSV_LOCATION_HEADER = "Lage"; + public static final String DEFAULT_CSV_GAUGE_HEADER = "Bezugspegel"; /** The storage that contains all WQKms objects for the different facets.*/ @@ -304,7 +316,10 @@ writer.writeNext(new String[] { msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER), - msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER) + msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), + msg(CSV_Q_DESC_HEADER, DEFAULT_CSV_Q_DESC_HEADER), + msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), + msg(CSV_GAUGE_HEADER, DEFAULT_CSV_GAUGE_HEADER) }); } @@ -319,13 +334,18 @@ int size = wqkms.size(); double[] result = new double[3]; + FLYSArtifact flys = (FLYSArtifact) master; + for (int i = 0; i < size; i ++) { result = wqkms.get(i, result); writer.writeNext(new String[] { kmf.format(result[2]), wf.format(result[0]), - qf.format(result[1]) + qf.format(result[1]), + "", // Bezeichnung + FLYSUtils.getLocationDescription(flys, result[2]), + "" // Bezugspegel }); } }