# HG changeset patch # User Andre Heinecke # Date 1408120039 -7200 # Node ID 09725b65955a220544d4807411883bcdbe7df52e # Parent 6f3cf934ae994176b99bdd54590bb035bbb7f16b Add new and simplyfied SedimentLoadFacet The SedimentLoadFacet is intended to work with the Measurement stations. It uses the same mechanismn to access the Mesurement station values as the calculation does. SedimentLoadLS values need a different facet that will come soon. diff -r 6f3cf934ae99 -r 09725b65955a artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Fri Aug 15 18:25:43 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Fri Aug 15 18:27:19 2014 +0200 @@ -358,6 +358,7 @@ String SEDIMENT_LOAD_TA_TOTAL = "sedimentload.ta.total"; String SEDIMENT_LOAD_TA_TOTAL_LOAD = "sedimentload.ta.total_load"; String SEDIMENT_LOAD_TA_UNKNOWN = "sedimentload.ta.unknown"; + String SEDIMENT_LOAD_TA_STATIC = "sedimentload.ta.static"; String SEDIMENT_LOAD_M3A_COARSE = "sedimentload.m3a.coarse"; String SEDIMENT_LOAD_M3A_SAND = "sedimentload.m3a.sand"; diff -r 6f3cf934ae99 -r 09725b65955a artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Fri Aug 15 18:27:19 2014 +0200 @@ -0,0 +1,129 @@ +/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU AGPL (>=v3) + * and comes with ABSOLUTELY NO WARRANTY! Check out the + * documentation coming with Dive4Elements River for details. + */ + +package org.dive4elements.river.artifacts.model.minfo; + +import gnu.trove.TDoubleArrayList; + +import org.dive4elements.artifactdatabase.state.Facet; +import org.dive4elements.artifactdatabase.state.StaticFacet; + +import org.dive4elements.artifacts.Artifact; +import org.dive4elements.artifacts.CallContext; +import org.dive4elements.artifacts.CallMeta; + +import org.dive4elements.river.artifacts.D4EArtifact; +import org.dive4elements.river.artifacts.access.RiverAccess; +import org.dive4elements.river.artifacts.resources.Resources; + +import org.dive4elements.river.artifacts.model.DataFacet; +import org.dive4elements.river.artifacts.model.FacetTypes; +import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataFactory; +import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData; + +import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; + +import org.dive4elements.river.utils.RiverUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; +import java.util.TreeMap; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; + + +/** Facet to access various sediment loads. */ +public class SedimentLoadFacet +extends DataFacet +implements FacetTypes, StaticFacet +{ + private static Logger logger = Logger.getLogger(SedimentLoadFacet.class); + + /* Aheinecke we probably need to get the kind and split this up here + * in some way */ + private static final String NAME = SEDIMENT_LOAD_TA_STATIC; + + public SedimentLoadFacet() { + } + + public SedimentLoadFacet(int idx, String name, String description, + ComputeType type, String stateId, String hash) { + super(idx, name, description, type, hash, stateId); + this.metaData.put("X", "chart.longitudinal.section.xaxis.label"); + this.metaData.put("Y", ""); + } + + @Override + public Object getData(Artifact artifact, CallContext context) { + logger.debug("get Data"); + D4EArtifact arti = (D4EArtifact) artifact; + + RiverAccess access = new RiverAccess(arti); + String idStr = arti.getDataAsString("load_id"); + int id = Integer.valueOf(idStr); + + /* Get all the data from the river. This will be nicely cached. */ + SedimentLoadData allLoadData = SedimentLoadDataFactory.INSTANCE.getSedimentLoadData( + access.getRiverName()); + + /* Now lets get what we want */ + TDoubleArrayList xPos = new TDoubleArrayList(); + TDoubleArrayList yPos = new TDoubleArrayList(); + + for (SedimentLoadData.Station sta: allLoadData.getStations()) { + double value = sta.findValueByLoadId(id); + if (Double.isNaN(value)) { + continue; + } + xPos.add(sta.getStation()); + yPos.add(value); + } + + return new double[][] {xPos.toNativeArray(), yPos.toNativeArray()}; + } + + @Override + public void setup(Artifact artifact, Document data, CallMeta callMeta) { + logger.debug("setup"); + String code = D4EArtifact.getDatacageIDValue(data); + String[] split = code.split(";"); + String idStr = split[0]; + String desc = ""; + if (split.length >= 2) { + desc = split[1]; + } + + logger.debug("Create for id: " + idStr + " with desc: " + desc); + + name = NAME; + description = Resources.getMsg( + callMeta, + "facet.sedimentload", + "Sedimentload", + new Object[] { desc }); + ((D4EArtifact)artifact).addStringData("load_id", idStr); + } + + + /** Copy deeply. */ + @Override + public Facet deepCopy() { + SedimentLoadFacet copy = new SedimentLoadFacet(); + copy.set(this); + copy.type = type; + copy.hash = hash; + copy.stateId = stateId; + return copy; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 6f3cf934ae99 -r 09725b65955a artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java Fri Aug 15 18:25:43 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java Fri Aug 15 18:27:19 2014 +0200 @@ -45,6 +45,7 @@ String facetName = bundle.getFacetName(); double [][] points; + logger.debug("Do out for: " + facetName); if (FacetTypes.IS.SEDIMENT_LOAD_M3A(facetName) || FacetTypes.IS.SEDIMENT_LOAD_TA(facetName)) { points = (double[][]) data;