Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java @ 8932:8731c3dabb56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extracting some winfo logic without breaking old code
author gernotbelger
date Tue, 06 Mar 2018 17:04:59 +0100
parents 5e38e2924c07
children 5294114b1df4
comparison
equal deleted inserted replaced
8931:b10f8415798c 8932:8731c3dabb56
83 "export.waterlevel.csv.header.w"; 83 "export.waterlevel.csv.header.w";
84 84
85 public static final String CSV_Q_HEADER = 85 public static final String CSV_Q_HEADER =
86 "export.waterlevel.csv.header.q"; 86 "export.waterlevel.csv.header.q";
87 87
88 /**
89 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
90 */
91 @Deprecated
88 public static final String CSV_Q_DESC_HEADER = 92 public static final String CSV_Q_DESC_HEADER =
89 "export.waterlevel.csv.header.q.desc"; 93 "export.waterlevel.csv.header.q.desc";
90 94
95 /**
96 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
97 */
98 @Deprecated
91 public static final String CSV_W_DESC_HEADER = 99 public static final String CSV_W_DESC_HEADER =
92 "export.waterlevel.csv.header.w.desc"; 100 "export.waterlevel.csv.header.w.desc";
93 101
94 public static final String CSV_LOCATION_HEADER = 102 public static final String CSV_LOCATION_HEADER =
95 "export.waterlevel.csv.header.location"; 103 "export.waterlevel.csv.header.location";
128 Pattern.compile("\\D*(\\d++.\\d*)\\D*"); 136 Pattern.compile("\\D*(\\d++.\\d*)\\D*");
129 137
130 public static final String DEFAULT_CSV_KM_HEADER = "Fluss-Km"; 138 public static final String DEFAULT_CSV_KM_HEADER = "Fluss-Km";
131 public static final String DEFAULT_CSV_W_HEADER = "W [NN + m]"; 139 public static final String DEFAULT_CSV_W_HEADER = "W [NN + m]";
132 public static final String DEFAULT_CSV_Q_HEADER = "Q [m\u00b3/s]"; 140 public static final String DEFAULT_CSV_Q_HEADER = "Q [m\u00b3/s]";
141 /**
142 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
143 */
144 @Deprecated
133 public static final String DEFAULT_CSV_Q_DESC_HEADER = "Bezeichnung"; 145 public static final String DEFAULT_CSV_Q_DESC_HEADER = "Bezeichnung";
146 /**
147 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
148 */
149 @Deprecated
134 public static final String DEFAULT_CSV_W_DESC_HEADER = "W/Pegel [cm]"; 150 public static final String DEFAULT_CSV_W_DESC_HEADER = "W/Pegel [cm]";
135 public static final String DEFAULT_CSV_LOCATION_HEADER = "Lage"; 151 public static final String DEFAULT_CSV_LOCATION_HEADER = "Lage";
136 public static final String DEFAULT_CSV_GAUGE_HEADER = "Bezugspegel"; 152 public static final String DEFAULT_CSV_GAUGE_HEADER = "Bezugspegel";
137 public static final String DEFAULT_CSV_NOT_IN_GAUGE_RANGE = 153 public static final String DEFAULT_CSV_NOT_IN_GAUGE_RANGE =
138 "außerhalb des gewählten Bezugspegels"; 154 "außerhalb des gewählten Bezugspegels";
266 282
267 return name; 283 return name;
268 } 284 }
269 285
270 286
287 /**
288 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
289 */
290 @Deprecated
271 protected String getCSVRowTitle(WINFOArtifact winfo, WQKms wqkms) { 291 protected String getCSVRowTitle(WINFOArtifact winfo, WQKms wqkms) {
272 log.debug("WaterlevelExporter.prepareNamedValue"); 292 log.debug("WaterlevelExporter.prepareNamedValue");
273 293
274 String name = wqkms.getName(); 294 String name = wqkms.getName();
275 295
297 317
298 318
299 /** 319 /**
300 * Get a string like 'W=' or 'Q=' with a number following in localized 320 * Get a string like 'W=' or 'Q=' with a number following in localized
301 * format. 321 * format.
302 */ 322 *
323 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
324 */
325 @Deprecated
303 protected String localizeWQKms(WINFOArtifact winfo, WQKms wqkms) { 326 protected String localizeWQKms(WINFOArtifact winfo, WQKms wqkms) {
304 WQ_MODE wqmode = RiverUtils.getWQMode(winfo); 327 WQ_MODE wqmode = RiverUtils.getWQMode(winfo);
305 Double rawValue = wqkms.getRawValue(); 328 Double rawValue = wqkms.getRawValue();
306 329
307 if (rawValue == null) { 330 if (rawValue == null) {
546 if (atGauge) { 569 if (atGauge) {
547 writer.writeNext(new String[] { 570 writer.writeNext(new String[] {
548 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), 571 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER),
549 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER, new Object[] { unit }), 572 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER, new Object[] { unit }),
550 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), 573 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER),
574
575 // FIXME: use WaterlevelDescriptionBuilder instead and also remove all this duplicate code.
551 (isQ 576 (isQ
552 ? msg(CSV_Q_DESC_HEADER, DEFAULT_CSV_Q_DESC_HEADER) 577 ? msg(CSV_Q_DESC_HEADER, DEFAULT_CSV_Q_DESC_HEADER)
553 : msg(CSV_W_DESC_HEADER, DEFAULT_CSV_W_DESC_HEADER)), 578 : msg(CSV_W_DESC_HEADER, DEFAULT_CSV_W_DESC_HEADER)),
554 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), 579 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER),
555 msg(CSV_GAUGE_HEADER, DEFAULT_CSV_GAUGE_HEADER) 580 msg(CSV_GAUGE_HEADER, DEFAULT_CSV_GAUGE_HEADER)
614 RiverUtils.getLocationDescription(flys, wqkm[2]), 639 RiverUtils.getLocationDescription(flys, wqkm[2]),
615 gaugeName 640 gaugeName
616 }); 641 });
617 } 642 }
618 643
644 /**
645 * @deprecated Use {@link WaterlevelDescriptionBuilder} instead.
646 */
647 @Deprecated
619 private String getDesc(WQKms wqkms, boolean isQ) 648 private String getDesc(WQKms wqkms, boolean isQ)
620 { 649 {
621 D4EArtifact flys = (D4EArtifact) master; 650 D4EArtifact flys = (D4EArtifact) master;
622 String colDesc = ""; 651 String colDesc = "";
623 652
http://dive4elements.wald.intevation.org