Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java @ 9321:a978b601a034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
author gernotbelger
date Fri, 27 Jul 2018 10:25:09 +0200
parents f48a8dc78529
children e014eca211a3
comparison
equal deleted inserted replaced
9320:61e6d158a20f 9321:a978b601a034
12 import java.util.Iterator; 12 import java.util.Iterator;
13 import java.util.List; 13 import java.util.List;
14 import java.util.Map; 14 import java.util.Map;
15 import java.util.TreeMap; 15 import java.util.TreeMap;
16 16
17 import org.apache.log4j.Logger;
18 import org.dive4elements.artifacts.Artifact; 17 import org.dive4elements.artifacts.Artifact;
19 import org.dive4elements.artifacts.CallContext; 18 import org.dive4elements.artifacts.CallContext;
20 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; 19 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
21 import org.dive4elements.river.artifacts.resources.Resources; 20 import org.dive4elements.river.artifacts.resources.Resources;
22 import org.dive4elements.river.artifacts.states.AddTableDataHelper; 21 import org.dive4elements.river.artifacts.states.AddTableDataHelper;
28 import org.w3c.dom.Element; 27 import org.w3c.dom.Element;
29 28
30 public class DistanceOnlyPartHistoricalSelect extends DistanceOnlySelect { 29 public class DistanceOnlyPartHistoricalSelect extends DistanceOnlySelect {
31 30
32 private static final long serialVersionUID = 1L; 31 private static final long serialVersionUID = 1L;
33 private static Logger log = Logger.getLogger(DistanceOnlyPartHistoricalSelect.class);
34 32
35 List<BedHeight> bhs = null; 33 private List<BedHeight> bhs = null;
36 Integer epoch = null; 34 private Integer epoch = null;
37 Integer year = null; 35 private Integer year = null;
38 Double lowerKm = null; 36 private Double lowerKm = null;
39 Double upperKm = null; 37 private Double upperKm = null;
40 River river = null; 38 private River river = null;
41 39
42 @Override 40 @Override
43 protected String getUIProvider() { 41 protected String getUIProvider() {
44 return "distance_only_part_historical_panel"; 42 return "distance_only_part_historical_panel";
45 } 43 }
54 protected void appendItems(final Artifact artifact, final ElementCreator creator, final String name, final CallContext context, final Element select) { 52 protected void appendItems(final Artifact artifact, final ElementCreator creator, final String name, final CallContext context, final Element select) {
55 final String datakey = "bedheights_for_part"; 53 final String datakey = "bedheights_for_part";
56 54
57 try { 55 try {
58 if (datakey.equals(name)) { 56 if (datakey.equals(name)) {
59 makeDataSourceYearEpoch(artifact, creator, select, context, getBedheights(artifact)); // ist nur n test 57 makeDataSourceYearEpoch(creator, select, context, getBedheights(artifact)); // ist nur n test
60 } else if (name.equals("ld_from_part")) { 58 } else if (name.equals("ld_from_part")) {
61 59
62 final SalixLineAccess access = new SalixLineAccess((UINFOArtifact) artifact); 60 final SalixLineAccess access = new SalixLineAccess((UINFOArtifact) artifact);
63 final double lowerSoundings = this.getLowerUpperKmRange(getBedheights(artifact))[0]; 61 final double lowerSoundings = this.getLowerUpperKmRange(getBedheights(artifact))[0];
64 final double lowerKm = access.getLowerKm() > lowerSoundings ? access.getLowerKm() : lowerSoundings; 62 final double lowerKm = access.getLowerKm() > lowerSoundings ? access.getLowerKm() : lowerSoundings;
87 85
88 } 86 }
89 } 87 }
90 catch ( 88 catch (
91 89
92 final IllegalArgumentException iae) { 90 final IllegalArgumentException iae) {
93 iae.printStackTrace(); 91 iae.printStackTrace();
94 } 92 }
95 } 93 }
96 94
97 private List<BedHeight> getBedheights(final Artifact artifact) { 95 private List<BedHeight> getBedheights(final Artifact artifact) {
116 } 114 }
117 return this.bhs; 115 return this.bhs;
118 116
119 } 117 }
120 118
121 private static final void makeDataSourceYearEpoch(final Artifact artifact, final ElementCreator creator, final Element select, final CallContext context, 119 private static final void makeDataSourceYearEpoch(final ElementCreator creator, final Element select, final CallContext context,
122 final List<BedHeight> bedheights) { 120 final List<BedHeight> bedheights) {
123 121
124 final AddTableDataHelper helper = new AddTableDataHelper(creator, select, "year", context.getMeta()); 122 final AddTableDataHelper helper = new AddTableDataHelper(creator, select, "year", context.getMeta());
125 123
126 // TODO: probably aggregating results, no sound-row, output as single row 124 // TODO: probably aggregating results, no sound-row, output as single row
182 } 180 }
183 181
184 } 182 }
185 return new double[] { min, max }; 183 return new double[] { min, max };
186 } 184 }
187
188 } 185 }
http://dive4elements.wald.intevation.org