Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/ZoomScale.java @ 8609:421e5cceac84
(issue1754) Better fix for radius calculation then 8607:2010da0904b7
Checking for that lower < upper is guranteed in radius calculation
makes more sense to do centrally in ZoomScale. This also works
for the MINFO Filter facets.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 24 Mar 2015 11:06:47 +0100 |
| parents | e4606eae8ea5 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8608:0f6f702742b4 | 8609:421e5cceac84 |
|---|---|
| 33 this(); | 33 this(); |
| 34 rivers.put(river, new TreeMap<Double, Double>()); | 34 rivers.put(river, new TreeMap<Double, Double>()); |
| 35 } | 35 } |
| 36 | 36 |
| 37 public double getRadius(String river, double lower, double upper) { | 37 public double getRadius(String river, double lower, double upper) { |
| 38 if (lower > upper) { | |
| 39 double buf = lower; | |
| 40 lower = upper; | |
| 41 upper = buf; | |
| 42 } | |
| 38 double range = Math.abs(upper) - Math.abs(lower); | 43 double range = Math.abs(upper) - Math.abs(lower); |
| 39 TreeMap<Double, Double> ranges = rivers.get(river); | 44 TreeMap<Double, Double> ranges = rivers.get(river); |
| 40 if (ranges == null) { | 45 if (ranges == null) { |
| 41 TreeMap<Double, Double> defaultRanges = rivers.get("default"); | 46 TreeMap<Double, Double> defaultRanges = rivers.get("default"); |
| 42 if (defaultRanges == null) { | 47 if (defaultRanges == null) { |