Mercurial > dive4elements > river
changeset 6539:4c463ca9b36e
issue1157: Make a better choice for master and active CrossSection.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 04 Jul 2013 12:12:37 +0200 |
| parents | de62db0f2035 |
| children | 24ca2f683c00 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Thu Jul 04 11:52:06 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Thu Jul 04 12:12:37 2013 +0200 @@ -143,7 +143,7 @@ fs.add(new CrossSectionFacet(0, cs.getDescription())); // Find out if we are newest and become master if so. - boolean isNewest = CrossSectionFactory.isNewest(cs); + boolean isNewest = cs.shouldBeMaster(getParentKm()); String newString = (isNewest) ? "1" : "0"; addStringData(DATA_IS_NEWEST, newString); addStringData(DATA_IS_MASTER, newString); @@ -165,11 +165,10 @@ RangeAccess rangeAccess = new RangeAccess(flys); double[] range = rangeAccess.getKmRange(); - double min = 0.0f; if (range != null && range.length > 0) { - min = range[0]; + this.addStringData(DATA_KM, Double.toString(range[0])); + this.addStringData(PARENT_KM, Double.toString(range[0])); } - this.addStringData(DATA_KM, Double.toString(min)); }