Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
| author | gernotbelger |
|---|---|
| date | Fri, 19 Jan 2018 11:23:42 +0100 |
| parents | 5e38e2924c07 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 116 if (kind != null && !kind.equals(RiverAxis.KIND_CURRENT)) { | 116 if (kind != null && !kind.equals(RiverAxis.KIND_CURRENT)) { |
| 117 axes = RiverAxis.getRiverAxis(river.getName(), | 117 axes = RiverAxis.getRiverAxis(river.getName(), |
| 118 getName(), Integer.parseInt(kind)); | 118 getName(), Integer.parseInt(kind)); |
| 119 } else { | 119 } else { |
| 120 if (reproject) { | 120 if (reproject) { |
| 121 log.debug("Query extent for RiverAxis with Srid: " + getSrid()); | 121 log.debug("Query extent for RiverAxis with Srid: " |
| 122 + getSrid()); | |
| 122 return GeometryUtils.transform( | 123 return GeometryUtils.transform( |
| 123 GeometryUtils.getRiverBoundary(river.getName()), | 124 GeometryUtils.getRiverBoundary(river.getName()), |
| 124 getSrid()); | 125 getSrid()); |
| 125 } | 126 } |
| 126 return GeometryUtils.getRiverBoundary(river.getName()); | 127 return GeometryUtils.getRiverBoundary(river.getName()); |