Mercurial > dive4elements > river
changeset 5094:6da542572ab1 dami
Use HWSLines data for HWS and Lines.
This is a quick fix to keep compatibility. Both Artifacts will
be replaced by a HWSLineArtifact.
Patch provided by Raimund Renkert <rrenkert@intevation.de>
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 25 Feb 2013 12:38:55 +0100 |
| parents | 558807975769 |
| children | d3193a336ddd |
| files | flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java Mon Feb 25 12:35:12 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java Mon Feb 25 12:38:55 2013 +0100 @@ -15,8 +15,8 @@ import de.intevation.artifactdatabase.state.Facet; import de.intevation.artifactdatabase.state.State; +import de.intevation.flys.model.HWSLine; import de.intevation.flys.model.River; -import de.intevation.flys.model.Hws; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.RiverFactory; @@ -118,11 +118,11 @@ @Override protected Envelope getExtent(boolean reproject) { - List<Hws> hws = Hws.getHws(getRiverId(), getName()); + List<HWSLine> hws = HWSLine.getLines(getRiverId(), getName()); Envelope max = null; - for (Hws h: hws) { + for (HWSLine h: hws) { Envelope env = h.getGeom().getEnvelopeInternal(); if (max == null) {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java Mon Feb 25 12:35:12 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java Mon Feb 25 12:38:55 2013 +0100 @@ -16,7 +16,7 @@ import de.intevation.artifactdatabase.state.State; import de.intevation.flys.model.River; -import de.intevation.flys.model.Line; +import de.intevation.flys.model.HWSLine; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.RiverFactory; @@ -118,11 +118,11 @@ @Override protected Envelope getExtent(boolean reproject) { - List<Line> lines = Line.getLines(getRiverId(), getName()); + List<HWSLine> lines = HWSLine.getLines(getRiverId(), getName()); Envelope max = null; - for (Line l: lines) { + for (HWSLine l: lines) { Envelope env = l.getGeom().getEnvelopeInternal(); if (max == null) {