Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 18 Jan 2018 20:12:01 +0100 |
| parents | 32c94ca227bc |
| children | 9744ce3c3853 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8855:d7c005e12af0 | 8856:5e38e2924c07 |
|---|---|
| 204 } | 204 } |
| 205 | 205 |
| 206 return rivers2officialLines; | 206 return rivers2officialLines; |
| 207 } | 207 } |
| 208 | 208 |
| 209 public static final Range MAX_RANGE = new Range(-Double.MAX_VALUE, +Double.MAX_VALUE); | 209 public static final Range MAX_RANGE = |
| 210 new Range(-Double.MAX_VALUE, +Double.MAX_VALUE); | |
| 210 | 211 |
| 211 private static final String nn(String s) { | 212 private static final String nn(String s) { |
| 212 return s != null ? s : ""; | 213 return s != null ? s : ""; |
| 213 } | 214 } |
| 214 | 215 |
| 257 catch (NumberFormatException nfe) { | 258 catch (NumberFormatException nfe) { |
| 258 return MAX_RANGE; | 259 return MAX_RANGE; |
| 259 } | 260 } |
| 260 } | 261 } |
| 261 | 262 |
| 262 private static List<ValueRange> filterByRange(Range range, List<ValueRange> ranges) { | 263 private static List<ValueRange> filterByRange( |
| 264 Range range, | |
| 265 List<ValueRange> ranges | |
| 266 ) { | |
| 263 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); | 267 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); |
| 264 for (ValueRange r: ranges) { | 268 for (ValueRange r: ranges) { |
| 265 if (r.intersects(range)) { | 269 if (r.intersects(range)) { |
| 266 list.add(r); | 270 list.add(r); |
| 267 } | 271 } |
| 268 } | 272 } |
| 269 return list; | 273 return list; |
| 270 } | 274 } |
| 271 | 275 |
| 272 private static List<ValueRange> filterByQRange(Range range, List<ValueRange> ranges) { | 276 private static List<ValueRange> filterByQRange( |
| 277 Range range, | |
| 278 List<ValueRange> ranges | |
| 279 ) { | |
| 273 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); | 280 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); |
| 274 for (ValueRange r: ranges) { | 281 for (ValueRange r: ranges) { |
| 275 if (r.intersectsValueRange(range) && !list.contains(r)) { | 282 if (r.intersectsValueRange(range) && !list.contains(r)) { |
| 276 list.add(r); | 283 list.add(r); |
| 277 } | 284 } |
| 278 } | 285 } |
| 279 return list; | 286 return list; |
| 280 } | 287 } |
| 281 | 288 |
| 282 private static List<ValueRange> filterByQValues(double[] values, List<ValueRange> ranges) { | 289 private static List<ValueRange> filterByQValues( |
| 290 double[] values, | |
| 291 List<ValueRange> ranges | |
| 292 ) { | |
| 283 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); | 293 List<ValueRange> list = new ArrayList<ValueRange>(ranges.size()); |
| 284 for (ValueRange r: ranges) { | 294 for (ValueRange r: ranges) { |
| 285 for (double val: values) { | 295 for (double val: values) { |
| 286 if (r.sameValue(val) && !list.contains(r)) { | 296 if (r.sameValue(val) && !list.contains(r)) { |
| 287 list.add(r); | 297 list.add(r); |