Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java @ 4862:b99656db18de
FLYSUtils: Use RangeAcces, removed getKmRange.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 23 Jan 2013 13:06:29 +0100 |
parents | 9790a284246c |
children | dc0d37715e16 |
comparison
equal
deleted
inserted
replaced
4861:aae2b7492c1e | 4862:b99656db18de |
---|---|
217 else { | 217 else { |
218 return WQ_INPUT.SINGLE; | 218 return WQ_INPUT.SINGLE; |
219 } | 219 } |
220 } | 220 } |
221 | 221 |
222 // TODO Moved to RangeAccess. Resolve remaining calls. | |
223 private static RangeAccess.KM_MODE getKmRangeMode(FLYSArtifact flys) { | |
224 RangeAccess rangeAccess = new RangeAccess(flys, null); | |
225 return rangeAccess.getKmRangeMode(); | |
226 } | |
227 | |
228 /** | |
229 * Get min and max kilometer, independent of parametization | |
230 * (ld_from/to vs ld_locations). | |
231 */ | |
232 public static double[] getKmRange(FLYSArtifact flys) { | |
233 switch (getKmRangeMode(flys)) { | |
234 case RANGE: { | |
235 return getKmFromTo(flys); | |
236 } | |
237 | |
238 case LOCATIONS: { | |
239 double[] locs = getLocations(flys); | |
240 return new double[] { locs[0], locs[locs.length-1] }; | |
241 } | |
242 | |
243 case NONE: { | |
244 double[] locs = getLocations(flys); | |
245 if (locs != null) { | |
246 return new double[] { locs[0], locs[locs.length-1] }; | |
247 } | |
248 else { | |
249 return getKmFromTo(flys); | |
250 } | |
251 } | |
252 } | |
253 | |
254 return new double[] { Double.NaN, Double.NaN }; | |
255 } | |
256 | |
257 | 222 |
258 /** | 223 /** |
259 * Get bounds for river of artifact. | 224 * Get bounds for river of artifact. |
260 * @param flysArtifact artifact which has a "river" data. | 225 * @param flysArtifact artifact which has a "river" data. |
261 * @return double array. min is at[0], max at[1]. null if given artifact is null | 226 * @return double array. min is at[0], max at[1]. null if given artifact is null |
462 if (river == null) { | 427 if (river == null) { |
463 logger.debug("no river found"); | 428 logger.debug("no river found"); |
464 return null; | 429 return null; |
465 } | 430 } |
466 | 431 |
467 double[] dist = getKmRange(flys); | 432 RangeAccess rangeAccess = new RangeAccess(flys, null); |
433 double[] dist = rangeAccess.getKmRange(); | |
468 | 434 |
469 if (dist == null) { | 435 if (dist == null) { |
470 logger.debug("no range found"); | 436 logger.debug("no range found"); |
471 return null; | 437 return null; |
472 } | 438 } |
909 if (river == null) { | 875 if (river == null) { |
910 logger.debug("getGauges: no river!"); | 876 logger.debug("getGauges: no river!"); |
911 return null; | 877 return null; |
912 } | 878 } |
913 | 879 |
914 double [] dist = getKmRange(flys); | 880 RangeAccess rangeAccess = new RangeAccess(flys, null); |
881 double[] dist = rangeAccess.getKmRange(); | |
915 if (dist == null) { | 882 if (dist == null) { |
916 logger.debug("getGauges: no dist!"); | 883 logger.debug("getGauges: no dist!"); |
917 return null; | 884 return null; |
918 } | 885 } |
919 logger.debug("getGauges: " + dist[0] + " - " + dist[1]); | 886 logger.debug("getGauges: " + dist[0] + " - " + dist[1]); |