Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java @ 7984:cf674b03901a facet-metadata
Bedheight facet now returns double[][]. Removed obsolete processor code.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Tue, 01 Jul 2014 13:27:53 +0200 |
parents | 8d5ca5175038 |
children | a709e6334c4a |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Tue Jul 01 13:25:46 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Tue Jul 01 13:27:53 2014 +0200 @@ -24,6 +24,7 @@ import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.minfo.BedHeightFacet; import org.dive4elements.river.artifacts.model.minfo.BedHeightFactory; +import org.dive4elements.river.artifacts.model.minfo.BedHeightSoundingWidthFacet; import org.dive4elements.river.artifacts.states.StaticState; import org.dive4elements.river.artifacts.resources.Resources; @@ -102,30 +103,32 @@ type = "singlevalues"; facetType = BEDHEIGHT_SOUNDING_WIDTH; } - // e.g. 'single' + addStringData("height_id", parts[2]); + addStringData("time", parts[3]); + addStringData("type", type); String btype = type; int hId = Integer.parseInt(parts[2]); - if (name.equals("bedheight")) { - addStringData("type", type); - addStringData("height_id", parts[2]); - addStringData("time", parts[3]); - } + if (type.equals("singlevalues")) { btype = "single"; } String bedHName = BedHeightFactory.getHeightName(btype, hId); + Facet facet = null; if (facetType.equals(BEDHEIGHT_SOUNDING_WIDTH)) { bedHName = Resources.getMsg( callMeta, "facet.bedheight.sounding_width", "facet.bedheight.sounding_widt", new Object[] { bedHName }); + facet = new BedHeightSoundingWidthFacet(facetType, bedHName); + } + else { + facet = new BedHeightFacet( + facetType, bedHName, type); } - Facet facet = new BedHeightFacet( - facetType, bedHName, type); ArrayList<Facet> facets = new ArrayList<Facet>(1); facets.add(facet);