Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java @ 9499:853f2dafc16e
VegetationZones in CrossSectionsDiagram
author | gernotbelger |
---|---|
date | Thu, 27 Sep 2018 18:06:26 +0200 |
parents | e2da9c8a7c57 |
children | d421c2bf0195 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java Wed Sep 26 15:48:05 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/VegetationZoneServerClientXChange.java Thu Sep 27 18:06:26 2018 +0200 @@ -45,14 +45,16 @@ } for (final String[] zone : results) { - final VegetationZoneServerClientXChange helper = new VegetationZoneServerClientXChange(zone[0], Integer.valueOf(zone[1]), Integer.valueOf(zone[2]), zone[3]); + final VegetationZoneServerClientXChange helper = new VegetationZoneServerClientXChange(zone[0], Integer.valueOf(zone[1]), Integer.valueOf(zone[2]), + zone[3]); resultList.add(helper); } return resultList; } - public static VegetationZoneServerClientXChange createFromTableEntry(final String zone, final String min_day_overflow, final String max_day_overflow, final String hexColor) { + public static VegetationZoneServerClientXChange createFromTableEntry(final String zone, final String min_day_overflow, final String max_day_overflow, + final String hexColor) { return new VegetationZoneServerClientXChange(zone, Integer.valueOf(min_day_overflow), Integer.valueOf(max_day_overflow), hexColor); // Error-Handling? } @@ -159,7 +161,7 @@ treeList.addAll(list); int lowerCompare = lower; for (final VegetationZoneServerClientXChange zone : treeList) { - if (zone.getLowerFromTo() > (lowerCompare + 1)) { // nicht inklusiv + if (zone.getLowerFromTo() > (lowerCompare)) { // nicht inklusiv return true; } lowerCompare = zone.getUpperFromTo(); @@ -176,12 +178,12 @@ final int upper = getUpperFromTo(); final int lower = getLowerFromTo(); - final int otherSchwerpunkt = (otherLower + otherUpper) / 2; - if ((otherUpper <= upper && otherUpper >= lower)) { + // final int otherSchwerpunkt = (otherLower + otherUpper) / 2; + if ((otherUpper <= upper && otherUpper > lower)) { return true; - } else if (otherLower >= lower && otherLower <= upper) { + } else if (otherLower >= lower && otherLower < upper) { return true; - } else if (otherSchwerpunkt >= (lower) && otherSchwerpunkt <= (upper)) { + } else if (otherLower == lower && otherUpper == upper) { return true; } return false;