Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 4861:aae2b7492c1e
WINFOArtifact: Updated to use RangeAccess instead of FLYSUtils.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 23 Jan 2013 13:05:36 +0100 |
| parents | 298d540f7b70 |
| children | acc34bf0d5b2 |
comparison
equal
deleted
inserted
replaced
| 4860:ba4d7f153890 | 4861:aae2b7492c1e |
|---|---|
| 232 WstValueTable wst = WstValueTableFactory.getTable(river); | 232 WstValueTable wst = WstValueTableFactory.getTable(river); |
| 233 if (wst == null) { | 233 if (wst == null) { |
| 234 return error(new WQKms[0], "no.wst.for.selected.river"); | 234 return error(new WQKms[0], "no.wst.for.selected.river"); |
| 235 } | 235 } |
| 236 | 236 |
| 237 | 237 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 238 double [] range = FLYSUtils.getKmRange(this); | 238 double [] range = rangeAccess.getKmRange(); |
| 239 if (range == null) { | 239 if (range == null) { |
| 240 return error(new WQKms[0], "no.range.found"); | 240 return error(new WQKms[0], "no.range.found"); |
| 241 } | 241 } |
| 242 | 242 |
| 243 double refKm; | 243 double refKm; |
| 687 if (r == null) { | 687 if (r == null) { |
| 688 logger.warn("no river found"); | 688 logger.warn("no river found"); |
| 689 return null; | 689 return null; |
| 690 } | 690 } |
| 691 | 691 |
| 692 double [] range = FLYSUtils.getKmRange(this); | 692 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 693 double [] range = rangeAccess.getKmRange(); | |
| 693 if (range == null) { | 694 if (range == null) { |
| 694 logger.warn("no ranges found"); | 695 logger.warn("no ranges found"); |
| 695 return null; | 696 return null; |
| 696 } | 697 } |
| 697 | 698 |
| 858 * | 859 * |
| 859 * @return the selected kms. | 860 * @return the selected kms. |
| 860 */ | 861 */ |
| 861 public double[] getKms() { | 862 public double[] getKms() { |
| 862 if (isRange()) { | 863 if (isRange()) { |
| 863 double[] distance = FLYSUtils.getKmRange(this); | 864 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 865 double [] distance = rangeAccess.getKmRange(); | |
| 864 return getKms(distance); | 866 return getKms(distance); |
| 865 | 867 |
| 866 } | 868 } |
| 867 else { | 869 else { |
| 868 return LocationDistanceSelect.getLocations(this); | 870 return LocationDistanceSelect.getLocations(this); |
| 872 | 874 |
| 873 public double [] getFromToStep() { | 875 public double [] getFromToStep() { |
| 874 if (!isRange()) { | 876 if (!isRange()) { |
| 875 return null; | 877 return null; |
| 876 } | 878 } |
| 877 double [] fromTo = FLYSUtils.getKmRange(this); | 879 RangeAccess rangeAccess = new RangeAccess(this, null); |
| 880 double [] fromTo = rangeAccess.getKmRange(); | |
| 878 | 881 |
| 879 if (fromTo == null) { | 882 if (fromTo == null) { |
| 880 return null; | 883 return null; |
| 881 } | 884 } |
| 882 | 885 |