Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java @ 7987:98ca61cb58fb facet-metadata
Split bed quality facets and updated processors and state.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Wed, 02 Jul 2014 09:31:14 +0200 |
parents | fe32a7f9655e |
children | e4606eae8ea5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java Wed Jul 02 09:29:39 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java Wed Jul 02 09:31:14 2014 +0200 @@ -25,12 +25,15 @@ import org.dive4elements.river.artifacts.model.DataFacet; import org.dive4elements.river.artifacts.model.DateRange; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.minfo.BedDensityFacet; +import org.dive4elements.river.artifacts.model.minfo.BedDensityTopFacet; +import org.dive4elements.river.artifacts.model.minfo.BedDensitySubFacet; +import org.dive4elements.river.artifacts.model.minfo.BedDiameterTopFacet; import org.dive4elements.river.artifacts.model.minfo.BedDiameterDataFacet; -import org.dive4elements.river.artifacts.model.minfo.BedDiameterFacet; import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult; +import org.dive4elements.river.artifacts.model.minfo.BedDiameterSubFacet; import org.dive4elements.river.artifacts.model.minfo.BedParametersResult; -import org.dive4elements.river.artifacts.model.minfo.BedPorosityFacet; +import org.dive4elements.river.artifacts.model.minfo.BedPorositySubFacet; +import org.dive4elements.river.artifacts.model.minfo.BedPorosityTopFacet; import org.dive4elements.river.artifacts.model.minfo.BedQualityCalculation; import org.dive4elements.river.artifacts.model.minfo.BedQualityDiameterResult; import org.dive4elements.river.artifacts.model.minfo.BedQualityResult; @@ -257,7 +260,7 @@ DateRange range = result.getDateRange(); BedDiameterResult[] bedDiameter = result.getBedResults(); for (int j = 0; j < bedDiameter.length; j++) { - newFacets.add(new BedDiameterFacet((idx << 8) + j, + newFacets.add(new BedDiameterTopFacet((idx << 8) + j, BED_QUALITY_BED_DIAMETER_TOPLAYER, createDiameterTopLayerDescription( meta, @@ -265,7 +268,7 @@ range), ComputeType.ADVANCE, stateId, hash)); - newFacets.add(new BedDiameterFacet((idx << 8) +j, + newFacets.add(new BedDiameterSubFacet((idx << 8) +j, BED_QUALITY_BED_DIAMETER_SUBLAYER, createDiameterSubLayerDescription( meta, @@ -288,7 +291,7 @@ if (bedDiameter.length > 0) { BedParametersResult[] bedParameters = result.getParameters(); for (int j = 0; j < bedParameters.length; j++) { - newFacets.add(new BedPorosityFacet((idx << 8) + j, + newFacets.add(new BedPorosityTopFacet((idx << 8) + j, BED_QUALITY_POROSITY_TOPLAYER, createPorosityTopLayerDescription( meta, @@ -296,7 +299,7 @@ range), ComputeType.ADVANCE, stateId, hash)); - newFacets.add(new BedPorosityFacet((idx << 8) + j, + newFacets.add(new BedPorositySubFacet((idx << 8) + j, BED_QUALITY_POROSITY_SUBLAYER, createPorositySubLayerDescription( meta, @@ -304,7 +307,7 @@ range), ComputeType.ADVANCE, stateId, hash)); - newFacets.add(new BedDensityFacet((idx << 8) + j, + newFacets.add(new BedDensityTopFacet((idx << 8) + j, BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER, createDensityTopLayerDescription( meta, @@ -312,7 +315,7 @@ range), ComputeType.ADVANCE, stateId, hash)); - newFacets.add(new BedDensityFacet((idx << 8) + j, + newFacets.add(new BedDensitySubFacet((idx << 8) + j, BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER, createDensitySubLayerDescription( meta,