Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java @ 9509:6146358c4842
Fixed: f2 sign corrected in vegetation zone height calculation, vegetation zone limit handling changed in the importer
| author | mschaefer |
|---|---|
| date | Mon, 01 Oct 2018 09:53:36 +0200 |
| parents | 361de818f76e |
| children | 9b8ba3b83a15 |
comparison
equal
deleted
inserted
replaced
| 9508:056483975a9c | 9509:6146358c4842 |
|---|---|
| 181 // if (!this.types.containsKey(Integer.valueOf(classNo))) { | 181 // if (!this.types.containsKey(Integer.valueOf(classNo))) { |
| 182 // logError("Unknown vegetation zone class: line " + this.in.getLineNumber()); | 182 // logError("Unknown vegetation zone class: line " + this.in.getLineNumber()); |
| 183 // return null; | 183 // return null; |
| 184 // } | 184 // } |
| 185 this.previousClassNo = classNo; | 185 this.previousClassNo = classNo; |
| 186 final int minDays = this.previousDaysLimit + 1; | 186 final int minDays = this.previousDaysLimit; |
| 187 this.previousDaysLimit = daysLimit; | 187 this.previousDaysLimit = daysLimit; |
| 188 final int red = (this.cols.get(ColTitlePattern.COLOR_R) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_R)]) : 0; | 188 final int red = (this.cols.get(ColTitlePattern.COLOR_R) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_R)]) : 0; |
| 189 final int green = (this.cols.get(ColTitlePattern.COLOR_G) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_G)]) : 0; | 189 final int green = (this.cols.get(ColTitlePattern.COLOR_G) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_G)]) : 0; |
| 190 final int blue = (this.cols.get(ColTitlePattern.COLOR_B) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_B)]) : 0; | 190 final int blue = (this.cols.get(ColTitlePattern.COLOR_B) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_B)]) : 0; |
| 191 return new VegetationZoneImport(classNo, minDays, daysLimit, red, green, blue); | 191 return new VegetationZoneImport(classNo, minDays, daysLimit, red, green, blue); |