# HG changeset patch # User Ingo Weinzierl # Date 1314777001 0 # Node ID ba9fa72dd6f53bf852bebba8a0dbab5b2a506cc6 # Parent 5b1198c27d43affaf279ede09e8fdbbd67fdd719 Write file path of DMGs into the WSPLGEN job while preparing WSPLGEN. flys-artifacts/trunk@2614 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 5b1198c27d43 -r ba9fa72dd6f5 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Tue Aug 30 15:17:43 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Aug 31 07:50:01 2011 +0000 @@ -1,3 +1,9 @@ +2011-08-31 Ingo Weinzierl + + * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: + Search for a DGM that fits to the current river and km range and write + its file path into the WSPLGEN job. + 2011-08-30 Ingo Weinzierl * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Improved diff -r 5b1198c27d43 -r ba9fa72dd6f5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java Tue Aug 30 15:17:43 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java Wed Aug 31 07:50:01 2011 +0000 @@ -29,6 +29,7 @@ import de.intevation.artifactdatabase.state.Facet; import de.intevation.flys.model.CrossSectionTrack; +import de.intevation.flys.model.DGM; import de.intevation.flys.model.RiverAxis; import de.intevation.flys.artifacts.FLYSArtifact; @@ -177,9 +178,9 @@ setLine(artifact, artifactDir, job); setAxis(artifact, artifactDir, job); setPro(artifact, artifactDir, job); + setDgm(artifact, job); // TODO - // setDgm(artifact, job); // SHP // setWsp(artifact, job); // WSP // setWspTag(artifact, job); // setArea(artifact, job); // SHP @@ -418,5 +419,23 @@ logger.error("Error while writing shapefile: " + ioe.getMessage()); } } + + + protected void setDgm(FLYSArtifact artifact, WSPLGENJob job) { + String river = artifact.getDataAsString("river"); + double[] range = FLYSUtils.getKmRange(artifact); + + DGM dgm = DGM.getDGM(river, range[0], range[1]); + + if (dgm == null) { + logger.warn( + "Could not find a DGM for river '" + river + "'" + + "(" + range[0] + " - " + range[1] + ")"); + + return; + } + + job.setDgm(dgm.getPath()); + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :