Mercurial > dive4elements > river
changeset 3046:6e4ad35bcb11
Fix certain GaugeDischargeArtifact-issues, import river.
flys-artifacts/trunk@4615 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 06 Jun 2012 15:48:59 +0000 |
| parents | 0905d1e7b37e |
| children | d20215a0afd8 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Jun 06 15:46:49 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Jun 06 15:48:59 2012 +0000 @@ -1,3 +1,8 @@ +2012-06-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java: + Fix issues, import river, documentation, more debug. + 2012-06-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeFacet.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Wed Jun 06 15:46:49 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Wed Jun 06 15:48:59 2012 +0000 @@ -15,7 +15,6 @@ import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallMeta; - import de.intevation.flys.artifacts.StaticFLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.WQKms; @@ -34,7 +33,7 @@ /** - * Artifact to store user-added points. + * Artifact to get discharge curves at gauges. */ public class GaugeDischargeArtifact extends WINFOArtifact @@ -51,7 +50,7 @@ * Trivial Constructor. */ public GaugeDischargeArtifact() { - logger.debug("GaugeDischargeArtifact.HistoricalQArtifact()"); + logger.debug("GaugeDischargeArtifact.GaugeDischargeArtifact()"); } @@ -96,6 +95,7 @@ logger.debug("GaugeDischargeArtifact.initialize"); List<Facet> fs = new ArrayList<Facet>(); FLYSArtifact artifact = (FLYSArtifact) art; + importData(artifact, "river"); // Get the location(s) //importData(artifact, "ld_mode"); @@ -106,17 +106,16 @@ addStringData("ld_to", "1000"); addStringData("ld_mode", "distance"); - DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, meta, fs); if (!fs.isEmpty()) { logger.debug("Facets to add in GaugeDischargeArtifact.initialize. (" - + state.getID() + ")."); + + state.getID() + "/ " + getCurrentStateId() + ")."); facets.put(getCurrentStateId(), fs); } else { logger.debug("No facets to add in GaugeDischargeArtifact.initialize (" - + state.getID() + ")."); + + state.getID() + "/ "+getCurrentStateId()+")."); } }