Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java @ 8747:e9d912c97fa8
We expect that every river has only one RiverAxis of kind 1
This allowed to reduce code duplication and some cleanups.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 05 Jun 2015 16:56:47 +0200 |
| parents | e4606eae8ea5 |
| children | 5e38e2924c07 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Fri Jun 05 16:53:07 2015 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Fri Jun 05 16:56:47 2015 +0200 @@ -113,10 +113,7 @@ String kind = getIdPart(2); - if (kind != null && kind.equals("1")) { - axes = RiverAxis.getRiverAxis(river.getName(), - Integer.parseInt(kind)); - } else if (kind != null) { + if (kind != null && !kind.equals(RiverAxis.KIND_CURRENT)) { axes = RiverAxis.getRiverAxis(river.getName(), getName(), Integer.parseInt(kind)); } else { @@ -125,11 +122,8 @@ return GeometryUtils.transform( GeometryUtils.getRiverBoundary(river.getName()), getSrid()); - } else { - return GeometryUtils.transform( - GeometryUtils.getRiverBoundary(river.getName()), - "31467"); } + return GeometryUtils.getRiverBoundary(river.getName()); } Envelope max = null; @@ -153,14 +147,16 @@ @Override protected String getFilter() { String kind = getIdPart(2); - if (kind != null && kind.equals("1")) { + if (kind != null && kind.equals(RiverAxis.KIND_CURRENT)) { return "river_id=" + String.valueOf(getRiverId()) + " AND kind_id=" + kind; - } else if (kind != null) { + } + if (kind != null) { return "river_id=" + String.valueOf(getRiverId()) + " AND kind_id=" + kind + " AND name='" + getName() + "'"; - } else if (getIdPart(1) != null) { + } + if (getIdPart(1) != null) { return "river_id=" + String.valueOf(getRiverId()) + " AND name='" + getName() + "'"; } @@ -173,9 +169,7 @@ if (RiverUtils.isUsingOracle()) { return "geom FROM river_axes USING SRID " + getSrid(); } - else { - return "geom FROM river_axes USING UNIQUE id"; - } + return "geom FROM river_axes USING UNIQUE id"; } @Override