Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryArtifact.java @ 5515:87dab419b924
Properly handle hydr_boundaries and hydr_boundaries_poly in datacage
This also fixes hydr_boundaries_poly which refered to the wrong
table
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Thu, 28 Mar 2013 17:13:53 +0100 |
| parents | a2735a4bf75e |
| children |
comparison
equal
deleted
inserted
replaced
| 5514:4c4fed23693f | 5515:87dab419b924 |
|---|---|
| 100 return FLYSUtils.getRiverSrid(river.getName()); | 100 return FLYSUtils.getRiverSrid(river.getName()); |
| 101 } | 101 } |
| 102 | 102 |
| 103 @Override | 103 @Override |
| 104 protected Envelope getExtent(boolean reproject) { | 104 protected Envelope getExtent(boolean reproject) { |
| 105 List<HydrBoundary> boundaries = HydrBoundary.getHydrBoundaries( | 105 List<HydrBoundary> boundaries; |
| 106 getRiverId(), getName()); | 106 String kind = getIdPart(2); |
| 107 if (kind != null) { | |
| 108 boundaries = HydrBoundary.getHydrBoundaries(getRiverId(), | |
| 109 getName(), Integer.parseInt(kind)); | |
| 110 } else { | |
| 111 boundaries = HydrBoundary.getHydrBoundaries(getRiverId(), getName()); | |
| 112 } | |
| 107 | 113 |
| 108 Envelope max = null; | 114 Envelope max = null; |
| 109 | 115 |
| 110 for (HydrBoundary b: boundaries) { | 116 for (HydrBoundary b: boundaries) { |
| 111 Envelope env = b.getGeom().getEnvelopeInternal(); | 117 Envelope env = b.getGeom().getEnvelopeInternal(); |
| 123 : max; | 129 : max; |
| 124 } | 130 } |
| 125 | 131 |
| 126 @Override | 132 @Override |
| 127 protected String getFilter() { | 133 protected String getFilter() { |
| 134 String kind = getIdPart(2); | |
| 135 if (kind != null) { | |
| 136 return "river_id=" + String.valueOf(getRiverId()) | |
| 137 + " AND name='" + getName() + "'" | |
| 138 + " AND kind = " + kind; | |
| 139 } | |
| 128 return "river_id=" + String.valueOf(getRiverId()) | 140 return "river_id=" + String.valueOf(getRiverId()) |
| 129 + " AND name='" + getName() + "'"; | 141 + " AND name='" + getName() + "'"; |
| 130 } | 142 } |
| 131 | 143 |
| 132 @Override | 144 @Override |