# HG changeset patch # User Andre Heinecke # Date 1361792335 -3600 # Node ID 6da542572ab14f1c27741a7ca200494fd99cfff6 # Parent 558807975769d0442d377dfcb2ccb6abe9976db8 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 diff -r 558807975769 -r 6da542572ab1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java --- 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.getHws(getRiverId(), getName()); + List hws = HWSLine.getLines(getRiverId(), getName()); Envelope max = null; - for (Hws h: hws) { + for (HWSLine h: hws) { Envelope env = h.getGeom().getEnvelopeInternal(); if (max == null) { diff -r 558807975769 -r 6da542572ab1 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java --- 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 lines = Line.getLines(getRiverId(), getName()); + List lines = HWSLine.getLines(getRiverId(), getName()); Envelope max = null; - for (Line l: lines) { + for (HWSLine l: lines) { Envelope env = l.getGeom().getEnvelopeInternal(); if (max == null) {