Mercurial > dive4elements > river

comparison gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java @ 9499:853f2dafc16e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
VegetationZones in CrossSectionsDiagram
author gernotbelger
date Thu, 27 Sep 2018 18:06:26 +0200
parents e2da9c8a7c57
children d421c2bf0195
comparison
equal deleted inserted replaced
9496:d8e753d0fdb9 9499:853f2dafc16e
43 } 43 }
44 } 44 }
45 } 45 }
46 for (final String[] zone : results) { 46 for (final String[] zone : results) {
47 47
48 final VegetationZoneServerClientXChange helper = new VegetationZoneServerClientXChange(zone[0], Integer.valueOf(zone[1]), Integer.valueOf(zone[2]), zone[3]); 48 final VegetationZoneServerClientXChange helper = new VegetationZoneServerClientXChange(zone[0], Integer.valueOf(zone[1]), Integer.valueOf(zone[2]),
49 zone[3]);
49 resultList.add(helper); 50 resultList.add(helper);
50 } 51 }
51 52
52 return resultList; 53 return resultList;
53 } 54 }
54 55
55 public static VegetationZoneServerClientXChange createFromTableEntry(final String zone, final String min_day_overflow, final String max_day_overflow, final String hexColor) { 56 public static VegetationZoneServerClientXChange createFromTableEntry(final String zone, final String min_day_overflow, final String max_day_overflow,
57 final String hexColor) {
56 return new VegetationZoneServerClientXChange(zone, Integer.valueOf(min_day_overflow), Integer.valueOf(max_day_overflow), hexColor); // Error-Handling? 58 return new VegetationZoneServerClientXChange(zone, Integer.valueOf(min_day_overflow), Integer.valueOf(max_day_overflow), hexColor); // Error-Handling?
57 } 59 }
58 60
59 private VegetationZoneServerClientXChange(final String zone, final Integer min_day_overflow, final Integer max_day_overflow, final String hexColor) { 61 private VegetationZoneServerClientXChange(final String zone, final Integer min_day_overflow, final Integer max_day_overflow, final String hexColor) {
60 this.zoneName = zone; 62 this.zoneName = zone;
157 159
158 final TreeSet<VegetationZoneServerClientXChange> treeList = new TreeSet<VegetationZoneServerClientXChange>(); 160 final TreeSet<VegetationZoneServerClientXChange> treeList = new TreeSet<VegetationZoneServerClientXChange>();
159 treeList.addAll(list); 161 treeList.addAll(list);
160 int lowerCompare = lower; 162 int lowerCompare = lower;
161 for (final VegetationZoneServerClientXChange zone : treeList) { 163 for (final VegetationZoneServerClientXChange zone : treeList) {
162 if (zone.getLowerFromTo() > (lowerCompare + 1)) { // nicht inklusiv 164 if (zone.getLowerFromTo() > (lowerCompare)) { // nicht inklusiv
163 return true; 165 return true;
164 } 166 }
165 lowerCompare = zone.getUpperFromTo(); 167 lowerCompare = zone.getUpperFromTo();
166 } 168 }
167 if ((lowerCompare) < upper) 169 if ((lowerCompare) < upper)
174 final int otherLower = otherZone.getLowerFromTo(); 176 final int otherLower = otherZone.getLowerFromTo();
175 final int otherUpper = otherZone.getUpperFromTo(); 177 final int otherUpper = otherZone.getUpperFromTo();
176 178
177 final int upper = getUpperFromTo(); 179 final int upper = getUpperFromTo();
178 final int lower = getLowerFromTo(); 180 final int lower = getLowerFromTo();
179 final int otherSchwerpunkt = (otherLower + otherUpper) / 2; 181 // final int otherSchwerpunkt = (otherLower + otherUpper) / 2;
180 if ((otherUpper <= upper && otherUpper >= lower)) { 182 if ((otherUpper <= upper && otherUpper > lower)) {
181 return true; 183 return true;
182 } else if (otherLower >= lower && otherLower <= upper) { 184 } else if (otherLower >= lower && otherLower < upper) {
183 return true; 185 return true;
184 } else if (otherSchwerpunkt >= (lower) && otherSchwerpunkt <= (upper)) { 186 } else if (otherLower == lower && otherUpper == upper) {
185 return true; 187 return true;
186 } 188 }
187 return false; 189 return false;
188 } 190 }
189 191
http://dive4elements.wald.intevation.org