diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java @ 7985:10debf4b82be facet-metadata

Split bed differences facet into data specific facets.
author Raimund Renkert <rrenkert@intevation.de>
date Tue, 01 Jul 2014 15:09:56 +0200
parents 868f55932fe6
children b5cba2690347
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java	Tue Jul 01 13:27:53 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java	Tue Jul 01 15:09:56 2014 +0200
@@ -25,8 +25,17 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffCalculation;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFacet;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFilterFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffHeightMinFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffHeightMinFilterFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffHeightSubFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffHeightSubFilterFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffMorphMinFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffMorphSubFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffPerYearFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffPerYearFilterFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffSoundingWidthFacet;
+import org.dive4elements.river.artifacts.model.minfo.BedDiffFilterFacet;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
 import org.dive4elements.river.artifacts.resources.Resources;
@@ -112,7 +121,7 @@
         newFacets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id));
         for (int idx = 0; idx < results.length; idx++) {
             if (results[idx] instanceof BedDiffYearResult) {
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffFacet(
                     idx,
                     BED_DIFFERENCE_YEAR,
                     createBedDiffYearDescription(
@@ -122,28 +131,28 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffSoundingWidthFacet(
                     idx,
                     BED_DIFFERENCE_SOUNDING_WIDTH,
                     createBedDiffSoundingDescription(meta),
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffMorphMinFacet(
                     idx,
                     BED_DIFFERENCE_MORPH_WIDTH1,
                     createBedDiffMorph1Description(meta),
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffMorphSubFacet(
                     idx,
                     BED_DIFFERENCE_MORPH_WIDTH2,
                     createBedDiffMorph2Description(meta),
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffHeightMinFacet(
                     idx,
                     BED_DIFFERENCE_YEAR_HEIGHT1,
                     createBedDiffHeightDescription(
@@ -154,7 +163,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                 newFacets.add(new BedDiffYearFacet(
+                 newFacets.add(new BedDiffHeightSubFacet(
                     idx,
                     BED_DIFFERENCE_YEAR_HEIGHT2,
                     createBedDiffHeightDescription(
@@ -165,7 +174,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFacet(
+                newFacets.add(new BedDiffPerYearFacet(
                     idx,
                     BED_DIFFERENCE_HEIGHT_YEAR,
                     createBedDiffAbsoluteDescription(
@@ -175,7 +184,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFilterFacet(
+                newFacets.add(new BedDiffFilterFacet(
                     idx,
                     BED_DIFFERENCE_YEAR_FILTERED,
                     createBedDiffYearDescription(
@@ -185,7 +194,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFilterFacet(
+                newFacets.add(new BedDiffHeightMinFilterFacet(
                     idx,
                     BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED,
                     createBedDiffHeightDescription(
@@ -196,7 +205,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                 newFacets.add(new BedDiffYearFilterFacet(
+                 newFacets.add(new BedDiffHeightSubFilterFacet(
                     idx,
                     BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED,
                     createBedDiffHeightDescription(
@@ -207,7 +216,7 @@
                     ComputeType.ADVANCE,
                     stateId,
                     hash));
-                newFacets.add(new BedDiffYearFilterFacet(
+                newFacets.add(new BedDiffPerYearFilterFacet(
                     idx,
                     BED_DIFFERENCE_HEIGHT_YEAR_FILTERED,
                     createBedDiffAbsoluteDescription(

http://dive4elements.wald.intevation.org