annotate backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java @ 9401:361de818f76e

Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
author mschaefer
date Tue, 14 Aug 2018 14:02:26 +0200
parents df6f1b5806f6
children 6146358c4842
rev   line source
9014
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
1 /* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
2 * Software engineering by
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
3 * Björnsen Beratende Ingenieure GmbH
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
4 * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
5 *
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
6 * This file is Free Software under the GNU AGPL (>=v3)
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
7 * and comes with ABSOLUTELY NO WARRANTY! Check out the
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
8 * documentation coming with Dive4Elements River for details.
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
9 */
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
10
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
11 package org.dive4elements.river.importer.uinfo.parsers;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
12
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
13 import java.io.File;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
14 import java.util.ArrayList;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
15 import java.util.EnumMap;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
16 import java.util.List;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
17 import java.util.regex.Matcher;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
18 import java.util.regex.Pattern;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
19
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
20 import org.apache.log4j.Logger;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
21 import org.dive4elements.river.importer.Config;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
22 import org.dive4elements.river.importer.ImportRiver;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
23 import org.dive4elements.river.importer.common.AbstractParser;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
24 import org.dive4elements.river.importer.common.ParsingState;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
25 import org.dive4elements.river.importer.uinfo.importitem.VegetationSeriesImport;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
26 import org.dive4elements.river.importer.uinfo.importitem.VegetationZoneImport;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
27 import org.dive4elements.river.model.uinfo.Vegetation;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
28 import org.dive4elements.river.model.uinfo.VegetationZone;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
29
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
30 /**
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
31 * Reads and parses a vegetation zones file
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
32 *
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
33 * @author Matthias Schäfer
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
34 *
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
35 */
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
36 public class VegetationParser extends AbstractParser<Vegetation, VegetationZone, VegetationZoneImport, VegetationSeriesImport> {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
37
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
38 /***** FIELDS *****/
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
39
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
40 private static final Logger log = Logger.getLogger(VegetationParser.class);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
41
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
42 private static final Pattern META_NAME = Pattern.compile("^#\\sEinteilung:\\s*([^;]*).*", Pattern.CASE_INSENSITIVE);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
43
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
44 private static final Pattern META_COLUMNTITLES = Pattern.compile("^#*\\s*Vegetationstyp\\s*;.+", Pattern.CASE_INSENSITIVE);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
45
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
46 private enum ColTitlePattern {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
47 OVERFLOW_LIMIT("((.)|(Ue))berflutungsdauer-bis\\s*\\[(.*)\\].*"), //
9401
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
48 CLASSNO("Vegetationsklasse.*"), //
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
49 COLOR_R("Rot"), //
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
50 COLOR_G("Gr((.)|(ue))n"), //
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
51 COLOR_B("Blau");
9014
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
52
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
53 private final Pattern pattern;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
54
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
55 ColTitlePattern(final String regexp) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
56 this.pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
57 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
58
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
59 public Pattern getPattern() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
60 return this.pattern;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
61 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
62 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
63
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
64 private final EnumMap<ColTitlePattern, Integer> cols = new EnumMap<>(ColTitlePattern.class);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
65
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
66 private int previousClassNo;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
67
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
68 private int previousDaysLimit;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
69
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
70
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
71 /***** CONSTRUCTORS *****/
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
72
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
73 public VegetationParser(final File importPath, final File rootRelativePath, final ImportRiver river) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
74 super(importPath, rootRelativePath, river);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
75 this.previousClassNo = 0;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
76 this.previousDaysLimit = -1;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
77 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
78
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
79
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
80 /***** METHODS *****/
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
81
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
82 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
83 protected Logger getLog() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
84 return log;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
85 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
86
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
87 /**
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
88 * Whether this import type shall be skipped
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
89 */
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
90 public static boolean shallSkip() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
91 return Config.INSTANCE.skipUInfoVegetation();
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
92 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
93
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
94 /**
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
95 * Creates a list of parsers for all vegetation import files in a directory
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
96 */
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
97 public static List<VegetationParser> createParsers(final File importDir, final File relativeDir, final ImportRiver river) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
98 final List<VegetationParser> parsers = new ArrayList<>();
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
99 if (importDir.exists()) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
100 for (final File file : listFiles(importDir, ".csv"))
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
101 parsers.add(new VegetationParser(file, new File(relativeDir, file.getName()), river));
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
102 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
103 return parsers;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
104 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
105
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
106 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
107 protected KmMode kmMode() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
108 return KmMode.NONE;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
109 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
110
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
111 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
112 protected VegetationSeriesImport createSeriesImport(final String filename) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
113 return new VegetationSeriesImport(filename);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
114 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
115
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
116 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
117 protected boolean handleMetaOther() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
118 if (handleMetaName())
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
119 return true;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
120 else
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
121 return false;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
122 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
123
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
124 private boolean handleMetaName() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
125 final Matcher m = META_NAME.matcher(this.currentLine);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
126 if (m.matches()) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
127 this.metaPatternsMatched.add(META_NAME);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
128 this.seriesHeader.setName(parseMetaInfo(m.group(1).trim()));
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
129 return true;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
130 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
131 return false;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
132 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
133
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
134 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
135 protected boolean handleMetaColumnTitles() {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
136 if (!META_COLUMNTITLES.matcher(this.currentLine).matches())
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
137 return false;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
138 this.metaPatternsMatched.add(META_COLUMNTITLES);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
139 this.columnTitles.clear();
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
140 final String[] titles = this.currentLine.split(SEPARATOR_CHAR, 0);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
141 for (int i = 0; i <= titles.length - 1; i++)
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
142 this.columnTitles.add(titles[i].trim());
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
143 for (final ColTitlePattern col : ColTitlePattern.values())
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
144 this.cols.put(col, -1);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
145 for (int i = 1; i <= this.columnTitles.size() - 1; i++) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
146 for (final ColTitlePattern col : ColTitlePattern.values()) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
147 if (col.getPattern().matcher(this.columnTitles.get(i)).matches()) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
148 this.cols.put(col, i);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
149 break;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
150 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
151 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
152 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
153 if ((this.cols.get(ColTitlePattern.OVERFLOW_LIMIT) < 0) || (this.cols.get(ColTitlePattern.CLASSNO) < 0)) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
154 logError("Column of the overflow duration limit and/or vegetation zone class could not be identified");
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
155 this.headerParsingState = ParsingState.STOP;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
156 return true;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
157 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
158 this.previousClassNo = 0;
9401
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
159 this.previousDaysLimit = -1;
9014
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
160 return true;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
161 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
162
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
163 @Override
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
164 protected VegetationZoneImport createKmLineImport(final Double km, final String[] values) {
9401
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
165 int daysLimit = 366;
9014
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
166 int classNo = 0;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
167 try {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
168 if (!values[this.cols.get(ColTitlePattern.OVERFLOW_LIMIT)].trim().isEmpty())
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
169 daysLimit = Integer.parseInt(values[this.cols.get(ColTitlePattern.OVERFLOW_LIMIT)]);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
170 classNo = Integer.parseInt(values[this.cols.get(ColTitlePattern.CLASSNO)]);
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
171 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
172 catch (final Exception e) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
173 logError("Overflow days limit and/or vegetation zone class could not be parsed: line " + this.in.getLineNumber());
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
174 return null;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
175 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
176 // Check completeness of vegetation zone type set, if needed
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
177 // if (classNo != this.previousClassNo + 1) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
178 // logError("Wrong vegetation zone class number or wrong class order: line " + this.in.getLineNumber());
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
179 // return null;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
180 // }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
181 // if (!this.types.containsKey(Integer.valueOf(classNo))) {
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
182 // logError("Unknown vegetation zone class: line " + this.in.getLineNumber());
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
183 // return null;
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
184 // }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
185 this.previousClassNo = classNo;
9401
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
186 final int minDays = this.previousDaysLimit + 1;
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
187 this.previousDaysLimit = daysLimit;
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
188 final int red = (this.cols.get(ColTitlePattern.COLOR_R) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_R)]) : 0;
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
189 final int green = (this.cols.get(ColTitlePattern.COLOR_G) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_G)]) : 0;
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
190 final int blue = (this.cols.get(ColTitlePattern.COLOR_B) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_B)]) : 0;
361de818f76e Added color fields to the vegetation zone database table and importer, max days field changed from exclusive to inclusive
mschaefer
parents: 9359
diff changeset
191 return new VegetationZoneImport(classNo, minDays, daysLimit, red, green, blue);
9014
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
192 }
201817aa7b1c Added the missing vegetation import classes
mschaefer
parents:
diff changeset
193 }

http://dive4elements.wald.intevation.org