Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixZone.java @ 9241:cbe393451ab0
minor bugfixes
| author | gernotbelger |
|---|---|
| date | Tue, 10 Jul 2018 18:53:04 +0200 |
| parents | 1c756bfee472 |
| children | 2ea7b61797d3 |
comparison
equal
deleted
inserted
replaced
| 9240:54173301bc34 | 9241:cbe393451ab0 |
|---|---|
| 107 | 107 |
| 108 final TreeSet<SalixZone> treeList = new TreeSet<>(); | 108 final TreeSet<SalixZone> treeList = new TreeSet<>(); |
| 109 treeList.addAll(list); | 109 treeList.addAll(list); |
| 110 double lowerCompare = lower + DELTA; | 110 double lowerCompare = lower + DELTA; |
| 111 for (final SalixZone zone : treeList) { | 111 for (final SalixZone zone : treeList) { |
| 112 if (zone.getLowerFromTo() > lowerCompare) { | 112 if ((zone.getUpperFromTo() - zone.getLowerFromTo()) > DELTA) { |
| 113 return true; | 113 if (zone.getLowerFromTo() > lowerCompare) { |
| 114 return true; | |
| 115 } | |
| 116 lowerCompare = zone.getUpperFromTo() + DELTA; | |
| 114 } | 117 } |
| 115 lowerCompare = zone.getUpperFromTo() + DELTA; | |
| 116 } | 118 } |
| 117 if ((lowerCompare + DELTA) < upper) | 119 if ((lowerCompare + DELTA) < upper) |
| 118 return true; // am Ende nicht geschlossen | 120 return true; // am Ende nicht geschlossen |
| 119 | 121 |
| 120 return false; | 122 return false; |
| 146 } | 148 } |
| 147 | 149 |
| 148 @Override | 150 @Override |
| 149 public int compareTo(final SalixZone o) { | 151 public int compareTo(final SalixZone o) { |
| 150 final int basicCompare = this.getLowerFromTo().compareTo(o.getLowerFromTo()); | 152 final int basicCompare = this.getLowerFromTo().compareTo(o.getLowerFromTo()); |
| 153 if (basicCompare == 0) { | |
| 154 return 1; // necessary for the treeSet! | |
| 155 } | |
| 151 return basicCompare; | 156 return basicCompare; |
| 152 } | 157 } |
| 153 | 158 |
| 154 public static boolean isValidAnschlussRange(final double fromTest, final double toTest, final List<SalixZone> list, final double minKm) { | 159 public static boolean isValidAnschlussRange(final double fromTest, final double toTest, final List<SalixZone> list, final double minKm) { |
| 155 final SalixZone zone = new SalixZone(0, fromTest, toTest); | 160 final SalixZone zone = new SalixZone(0, fromTest, toTest); |